Merge pull request #652 from apple/revert-651-revert-629-verify-swiftinterfaces-by-default

Verify emitted module interfaces by default (Take 2)

Author: xymus

Sources/SwiftDriver/Jobs/Planning.swift

@@ -405,7 +405,14 @@ extension Driver {
        parsedOptions.hasArgument(.enableLibraryEvolution),
        parsedOptions.hasFlag(positive: .verifyEmittedModuleInterface,
                              negative: .noVerifyEmittedModuleInterface,
-                             default: false)
+                             default: true),
+
+      // Don't verify by default modules emitted from a merge-module job
+      // as it's more likely to be invalid
+      shouldCreateEmitModuleJob || compilerMode == .singleCompile ||
+        parsedOptions.hasFlag(positive: .verifyEmittedModuleInterface,
+                              negative: .noVerifyEmittedModuleInterface,
+                              default: false)
     else { return }
 
     func addVerifyJob(forPrivate: Bool) throws {

Tests/SwiftDriverTests/SwiftDriverTests.swift

@@ -3958,11 +3958,30 @@ final class SwiftDriverTests: XCTestCase {
       XCTAssertEqual(plannedJobs.count, 2)
     }
 
+    // Explicitly disabled
+    do {
+      var driver = try Driver(args: ["swiftc", "foo.swift", "-emit-module", "-module-name",
+                                     "foo", "-emit-module-interface",
+                                     "-enable-library-evolution",
+                                     "-no-verify-emitted-module-interface"])
+      let plannedJobs = try driver.planBuild()
+      XCTAssertEqual(plannedJobs.count, 2)
+    }
+
+    // Disabled by default in merge-module
+    do {
+      var driver = try Driver(args: ["swiftc", "foo.swift", "-emit-module", "-module-name",
+                                     "foo", "-emit-module-interface",
+                                     "-enable-library-evolution",
+                                     "-no-emit-module-separately"])
+      let plannedJobs = try driver.planBuild()
+      XCTAssertEqual(plannedJobs.count, 2)
+    }
+
     // Emit-module separately
     do {
       var driver = try Driver(args: ["swiftc", "foo.swift", "-emit-module", "-module-name",
                                      "foo", "-emit-module-interface",
-                                     "-verify-emitted-module-interface",
                                      "-enable-library-evolution",
                                      "-experimental-emit-module-separately"])
       let plannedJobs = try driver.planBuild()
@@ -3983,7 +4002,6 @@ final class SwiftDriverTests: XCTestCase {
     do {
       var driver = try Driver(args: ["swiftc", "foo.swift", "-emit-module", "-module-name",
                                      "foo", "-emit-module-interface",
-                                     "-verify-emitted-module-interface",
                                      "-enable-library-evolution",
                                      "-whole-module-optimization"])
       let plannedJobs = try driver.planBuild()