Merge pull request #10543 from bitjammer/rdar-32604558-migrator-skip-ast-passes-swift-4-swift-4.0-branch

[Migrator] Don't run AST passes when in Swift 4 or later

Author: bitjammer

lib/Migrator/Migrator.cpp

@@ -53,9 +53,11 @@ bool migrator::updateCodeAndEmitRemap(CompilerInstance *Instance,
   }
 
   // Phase 2: Syntactic Transformations
-  auto FailedSyntacticPasses = M.performSyntacticPasses();
-  if (FailedSyntacticPasses) {
-    return true;
+  if (Invocation.getLangOptions().EffectiveLanguageVersion[0] < 4) {
+    auto FailedSyntacticPasses = M.performSyntacticPasses();
+    if (FailedSyntacticPasses) {
+      return true;
+    }
   }
 
   // Phase 3: Post Fix-it Passes

lib/Migrator/README.md

@@ -48,7 +48,7 @@ Here are the passes:
 2. AST Passes
 
    If the Pre-fix-it Pass was successful, or skipped because it was unnecessary, the
-   *AST Passes* run. These include:
+   *AST Passes* run if you are migrating *from before Swift 4*. These include:
 
    - API Diff Pass
 

test/Migrator/DoubleEditAPI.json

@@ -1,4 +1,11 @@
 [
+  {
+    "DiffItemKind": "TypeMemberDiffItem",
+    "Usr": "c:@E@FooComparisonResult@FooOrderedAscending",
+    "OldPrintedName": "FooOrderedAscending",
+    "NewPrintedName": "orderedAscending",
+    "NewTypeName": "FooComparisonResult"
+  },
   {
     "DiffItemKind": "TypeMemberDiffItem",
     "Usr": "c:@SA@SomeItemSet",

test/Migrator/no_ast_passes_after_swift4.swift

@@ -0,0 +1,9 @@
+// REQUIRES: objc_interop
+// RUN: %empty-directory(%t) && %target-swift-frontend -c -update-code -primary-file %s -F %S/mock-sdk -api-diff-data-file %S/Inputs/DoubleEditAPI.json -emit-migrated-file-path %t/no_ast_passes_after_swift4.swift.result -emit-remap-file-path %t/no_ast_passes_after_swift4.swift.remap -o /dev/null -swift-version 4
+// RUN: diff -u %S/no_ast_passes_after_swift4.swift.expected %t/no_ast_passes_after_swift4.swift.result
+// RUN: %target-swift-frontend -typecheck -F %S/mock-sdk -swift-version 4 %t/no_ast_passes_after_swift4.swift.result
+
+import Bar
+func foo() -> FooComparisonResult {
+  return FooComparisonResult.orderedAscending
+}

test/Migrator/no_ast_passes_after_swift4.swift.expected

@@ -0,0 +1,9 @@
+// REQUIRES: objc_interop
+// RUN: %empty-directory(%t) && %target-swift-frontend -c -update-code -primary-file %s -F %S/mock-sdk -api-diff-data-file %S/Inputs/DoubleEditAPI.json -emit-migrated-file-path %t/no_ast_passes_after_swift4.swift.result -emit-remap-file-path %t/no_ast_passes_after_swift4.swift.remap -o /dev/null -swift-version 4
+// RUN: diff -u %S/no_ast_passes_after_swift4.swift.expected %t/no_ast_passes_after_swift4.swift.result
+// RUN: %target-swift-frontend -typecheck -F %S/mock-sdk -swift-version 4 %t/no_ast_passes_after_swift4.swift.result
+
+import Bar
+func foo() -> FooComparisonResult {
+  return FooComparisonResult.orderedAscending
+}