[arcmt] Don't try to handle files that are already ARC'ified, this is not possible currently.

rdar://14461559

llvm-svn: 190880

1 files changed, 0 insertions, 19 deletions

diff --git a/clang/lib/ARCMigrate/ARCMT.cpp b/clang/lib/ARCMigrate/ARCMT.cpp
index 477e327071a..3e429beded5 100644
--- a/clang/lib/ARCMigrate/ARCMT.cpp
+++ b/clang/lib/ARCMigrate/ARCMT.cpp
@@ -270,8 +270,6 @@ bool arcmt::checkForManualIssues(CompilerInvocation &origCI,
     return true;
   }
 
-  bool hadARCErrors = capturedDiags.hasErrors();
-
   // Don't filter diagnostics anymore.
   Diags->setClient(DiagClient, /*ShouldOwnClient=*/false);
 
@@ -323,15 +321,6 @@ bool arcmt::checkForManualIssues(CompilerInvocation &origCI,
   DiagClient->EndSourceFile();
   errRec.FinishCapture();
 
-  if (hadARCErrors) {
-    // If we are migrating code that gets the '-fobjc-arc' flag, make sure
-    // to remove it so that we don't get errors from normal compilation.
-    origCI.getLangOpts()->ObjCAutoRefCount = false;
-    // Disable auto-synthesize to avoid "@synthesize of 'weak' property is only
-    // allowed in ARC" errors.
-    origCI.getLangOpts()->ObjCDefaultSynthProperties = false;
-  }
-
   return capturedDiags.hasErrors() || testAct.hasReportedErrors();
 }
 
@@ -381,14 +370,6 @@ static bool applyTransforms(CompilerInvocation &origCI,
     origCI.getLangOpts()->ObjCAutoRefCount = true;
     return migration.getRemapper().overwriteOriginal(*Diags);
   } else {
-    if (migration.HadARCErrors) {
-      // If we are migrating code that gets the '-fobjc-arc' flag, make sure
-      // to remove it so that we don't get errors from normal compilation.
-      origCI.getLangOpts()->ObjCAutoRefCount = false;
-      // Disable auto-synthesize to avoid "@synthesize of 'weak' property is only
-      // allowed in ARC" errors.
-      origCI.getLangOpts()->ObjCDefaultSynthProperties = false;
-    }
     return migration.getRemapper().flushToDisk(outputDir, *Diags);
   }
 }