cpp11-migrate: Transform now responsible for file content overriding

To better support per-translation unit replacements, any real work is being
moved out of ActionFactory and into Transform. In this revision, that means
file override application.

For simplification, Transform no longer inherits from SourceFileCallbacks.
TransformTest required updating as a result.

llvm-svn: 184098

1 files changed, 4 insertions, 3 deletions

diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp
index c628fac3b8b..ac07bd36a71 100644
--- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp
+++ b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp
@@ -43,13 +43,14 @@ int AddOverrideTransform::apply(const FileOverrides &InputStates,
   MatchFinder Finder;
   AddOverrideFixer Fixer(AddOverrideTool.getReplacements(), AcceptedChanges,
                          DetectMacros);
+  Finder.addMatcher(makeCandidateForOverrideAttrMatcher(), &Fixer);
+
   // Make Fixer available to handleBeginSource().
   this->Fixer = &Fixer;
 
-  Finder.addMatcher(makeCandidateForOverrideAttrMatcher(), &Fixer);
+  setOverrides(InputStates);
 
-  if (int result =
-          AddOverrideTool.run(createActionFactory(Finder, InputStates))) {
+  if (int result = AddOverrideTool.run(createActionFactory(Finder))) {
     llvm::errs() << "Error encountered during translation.\n";
     return result;
   }