cpp11-migrate: Refactor for driver model of operation

Re-commit of r189691 and r189689 now with a proper autoconf fix.

Massive simplification of how replacements and file overrides are
handled by the migrator:
* Sources and headers are all treated the same.
* All replacements for a given translation unit are stored in the same
  TranslationUnitReplacements structure.
* Change tracking is updated only from main file; no need for
  propagating "is tracking" flag around.
* Transform base class no longer responsible for applying replacements.
  They are simply stored and main() looks after deduplication and
  application.
* Renamed -yaml-only to -serialize-replacements. Same restrictions apply:
  Can only request one transform. New restriction: formatting cannot also
  be turned on since it's basically a transform.
* If -serialize-replacements is requested, changes to files will not be
  applied on disk.
* Changed behaviour of function generating names for serialized
  replacements: Only the main source file goes into the name of the file
  since a file may contain changes for multiple different files.
* Updated HeaderReplacements LIT test for new serialization behaviour.
  * Replaced old test that ensures replacements are not serialized if
    -serialize-replacements is not provided. New version ensures changes
    are made directly to all files in the translation unit.
* Updated unit tests.
  * Due to major simplification of structures in FileOverrides.h, the
    FileOverridesTest is quite a bit simpler now.

llvm-svn: 189798

1 files changed, 8 insertions, 9 deletions

diff --git a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopActions.cpp b/clang-tools-extra/cpp11-migrate/LoopConvert/LoopActions.cpp
index da9d7b56557..0ba49d8ad4f 100644
--- a/clang-tools-extra/cpp11-migrate/LoopConvert/LoopActions.cpp
+++ b/clang-tools-extra/cpp11-migrate/LoopConvert/LoopActions.cpp
@@ -815,9 +815,9 @@ void LoopFixer::doConversion(ASTContext *Context,
       // the declaration of the alias variable. This is probably a bug.
       ReplacementText = ";";
 
-    Replace->insert(Replacement(Context->getSourceManager(),
-                                CharSourceRange::getTokenRange(ReplaceRange),
-                                ReplacementText));
+    Owner.addReplacementForCurrentTU(Replacement(
+        Context->getSourceManager(),
+        CharSourceRange::getTokenRange(ReplaceRange), ReplacementText));
     // No further replacements are made to the loop, since the iterator or index
     // was used exactly once - in the initialization of AliasVar.
   } else {
@@ -830,10 +830,9 @@ void LoopFixer::doConversion(ASTContext *Context,
          I != E; ++I) {
       std::string ReplaceText = I->IsArrow ? VarName + "." : VarName;
       ReplacedVarRanges->insert(std::make_pair(TheLoop, IndexVar));
-      Replace->insert(
+      Owner.addReplacementForCurrentTU(
           Replacement(Context->getSourceManager(),
-                      CharSourceRange::getTokenRange(I->Range),
-                      ReplaceText));
+                      CharSourceRange::getTokenRange(I->Range), ReplaceText));
     }
   }
 
@@ -862,9 +861,9 @@ void LoopFixer::doConversion(ASTContext *Context,
   std::string TypeString = AutoRefType.getAsString();
   std::string Range = ("(" + TypeString + " " + VarName + " : "
                            + MaybeDereference + ContainerString + ")").str();
-  Replace->insert(Replacement(Context->getSourceManager(),
-                              CharSourceRange::getTokenRange(ParenRange),
-                              Range));
+  Owner.addReplacementForCurrentTU(
+      Replacement(Context->getSourceManager(),
+                  CharSourceRange::getTokenRange(ParenRange), Range));
   GeneratedDecls->insert(make_pair(TheLoop, VarName));
 }