[arcmt] Remove '-arcmt-modify-in-memory', it turned out less useful than we hoped it would be.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@133315 91177308-0d34-0410-b5e6-96231b3b80d8

5 files changed, 2 insertions, 66 deletions

diff --git a/lib/ARCMigrate/ARCMT.cpp b/lib/ARCMigrate/ARCMT.cpp
index 98e593c0fa..04c35e28c8 100644
--- a/lib/ARCMigrate/ARCMT.cpp
+++ b/lib/ARCMigrate/ARCMT.cpp
@@ -277,41 +277,6 @@ bool arcmt::applyTransformations(CompilerInvocation &origCI,
 }
 
 //===----------------------------------------------------------------------===//
-// applyTransformationsInMemory.
-//===----------------------------------------------------------------------===//
-
-bool arcmt::applyTransformationsInMemory(CompilerInvocation &origCI,
-                                       llvm::StringRef Filename, InputKind Kind,
-                                       DiagnosticClient *DiagClient) {
-  if (!origCI.getLangOpts().ObjC1)
-    return false;
-
-  // Make sure checking is successful first.
-  CompilerInvocation CInvokForCheck(origCI);
-  if (arcmt::checkForManualIssues(CInvokForCheck, Filename, Kind, DiagClient))
-    return true;
-
-  CompilerInvocation CInvok(origCI);
-  CInvok.getFrontendOpts().Inputs.clear();
-  CInvok.getFrontendOpts().Inputs.push_back(std::make_pair(Kind, Filename));
-  
-  MigrationProcess migration(CInvok, DiagClient);
-
-  std::vector<TransformFn> transforms = arcmt::getAllTransformations();
-  assert(!transforms.empty());
-
-  for (unsigned i=0, e = transforms.size(); i != e; ++i) {
-    bool err = migration.applyTransform(transforms[i]);
-    if (err) return true;
-  }
-
-  origCI.getLangOpts().ObjCAutoRefCount = true;
-  migration.getRemapper().transferMappingsAndClear(origCI);
-
-  return false;
-}
-
-//===----------------------------------------------------------------------===//
 // CollectTransformActions.
 //===----------------------------------------------------------------------===//
 
diff --git a/lib/ARCMigrate/ARCMTActions.cpp b/lib/ARCMigrate/ARCMTActions.cpp
index a30c2783e3..4da928a0eb 100644
--- a/lib/ARCMigrate/ARCMTActions.cpp
+++ b/lib/ARCMigrate/ARCMTActions.cpp
@@ -41,18 +41,3 @@ void TransformationAction::ExecuteAction() {
 
 TransformationAction::TransformationAction(FrontendAction *WrappedAction)
   : WrapperFrontendAction(WrappedAction) {}
-
-void InMemoryTransformationAction::ExecuteAction() {
-  CompilerInstance &CI = getCompilerInstance();
-  if (arcmt::applyTransformationsInMemory(CI.getInvocation(), getCurrentFile(),
-                                          getCurrentFileKind(),
-                                          CI.getDiagnostics().getClient()))
-    return;
-
-  WrapperFrontendAction::ExecuteAction();
-}
-
-InMemoryTransformationAction::InMemoryTransformationAction(
-    FrontendAction *WrappedAction)
-  : WrapperFrontendAction(WrappedAction) {}
-
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index b72f12abde..804094ba53 100644
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1391,8 +1391,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
 
   if (!Args.hasArg(options::OPT_fno_objc_arc)) {
     if (const Arg *A = Args.getLastArg(options::OPT_ccc_arrmt_check,
-                                       options::OPT_ccc_arrmt_modify,
-                                       options::OPT_ccc_arrmt_modify_in_memory)) {
+                                       options::OPT_ccc_arrmt_modify)) {
       switch (A->getOption().getID()) {
       default:
         llvm_unreachable("missed a case");
@@ -1402,9 +1401,6 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       case options::OPT_ccc_arrmt_modify:
         CmdArgs.push_back("-arcmt-modify");
         break;
-      case options::OPT_ccc_arrmt_modify_in_memory:
-        CmdArgs.push_back("-arcmt-modify-in-memory");
-        break;
       }
     }
   }
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 2c158fb1e4..c9718c4d88 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -424,9 +424,6 @@ static void FrontendOptsToArgs(const FrontendOptions &Opts,
   case FrontendOptions::ARCMT_Modify:
     Res.push_back("-arcmt-modify");
     break;
-  case FrontendOptions::ARCMT_ModifyInMemory:
-    Res.push_back("-arcmt-modify-in-memory");
-    break;
   }
 
   bool NeedLang = false;
@@ -1242,8 +1239,7 @@ static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
 
   Opts.ARCMTAction = FrontendOptions::ARCMT_None;
   if (const Arg *A = Args.getLastArg(OPT_arcmt_check,
-                                     OPT_arcmt_modify,
-                                     OPT_arcmt_modify_in_memory)) {
+                                     OPT_arcmt_modify)) {
     switch (A->getOption().getID()) {
     default:
       llvm_unreachable("missed a case");
@@ -1253,9 +1249,6 @@ static InputKind ParseFrontendArgs(FrontendOptions &Opts, ArgList &Args,
     case OPT_arcmt_modify:
       Opts.ARCMTAction = FrontendOptions::ARCMT_Modify;
       break;
-    case OPT_arcmt_modify_in_memory:
-      Opts.ARCMTAction = FrontendOptions::ARCMT_ModifyInMemory;
-      break;
     }
   }
 
diff --git a/lib/FrontendTool/ExecuteCompilerInvocation.cpp b/lib/FrontendTool/ExecuteCompilerInvocation.cpp
index 7ad263e14b..eb1c208df1 100644
--- a/lib/FrontendTool/ExecuteCompilerInvocation.cpp
+++ b/lib/FrontendTool/ExecuteCompilerInvocation.cpp
@@ -100,9 +100,6 @@ static FrontendAction *CreateFrontendAction(CompilerInstance &CI) {
   case FrontendOptions::ARCMT_Modify:
     Act = new arcmt::TransformationAction(Act);
     break;
-  case FrontendOptions::ARCMT_ModifyInMemory:
-    Act = new arcmt::InMemoryTransformationAction(Act);
-    break;
   }
 
   // If there are any AST files to merge, create a frontend action