add isCrossModuleIncrementalBuildEnabled, but do nothing with it yet

Fix tests after extra message

Author: David Ungar

Sources/SwiftDriver/IncrementalCompilation/IncrementalCompilationState.swift

@@ -13,6 +13,9 @@ import TSCBasic
 import Foundation
 import SwiftOptions
 public class IncrementalCompilationState {
+  /// Whether cross-module incrementality is enabled
+  private let isCrossModuleIncrementalBuildEnabled: Bool
+
   /// The oracle for deciding what depends on what. Applies to this whole module.
   private let moduleDependencyGraph: ModuleDependencyGraph
 
@@ -56,6 +59,11 @@ public class IncrementalCompilationState {
       self.reporter = nil
     }
 
+    self.isCrossModuleIncrementalBuildEnabled =
+      driver.parsedOptions.contains(.enableExperimentalCrossModuleIncrementalBuild)
+    reporter?.report(
+      "\(self.isCrossModuleIncrementalBuildEnabled ? "Enabling" : "Disabling") incremental cross-module building")
+
 
     guard let (outputFileMap, buildRecordInfo, outOfDateBuildRecord)
             = try driver.getBuildInfo(self.reporter)
@@ -66,13 +74,12 @@ public class IncrementalCompilationState {
     guard let (
       moduleDependencyGraph,
       inputsHavingMalformedDependencySources: inputsHavingMalformedDependencySources
-    ) =
-            Self.computeModuleDependencyGraph(
-              buildRecordInfo,
-              outOfDateBuildRecord,
-              outputFileMap,
-              &driver,
-              self.reporter)
+    ) = Self.computeModuleDependencyGraph(
+      buildRecordInfo,
+      outOfDateBuildRecord,
+      outputFileMap,
+      &driver,
+      self.reporter)
     else {
       return nil
     }

Tests/SwiftDriverTests/IncrementalCompilationTests.swift

@@ -431,6 +431,7 @@ final class IncrementalCompilationTests: XCTestCase {
         // Leave off the part after the colon because it varies on Linux:
         // MacOS: The operation could not be completed. (TSCBasic.FileSystemError error 3.).
         // Linux: The operation couldn’t be completed. (TSCBasic.FileSystemError error 3.)
+        "Disabling incremental cross-module building",
         "Incremental compilation: Incremental compilation could not read build record at",
         "Incremental compilation: Disabling incremental build: could not read build record",
         "Found 2 batchable jobs",
@@ -450,6 +451,7 @@ final class IncrementalCompilationTests: XCTestCase {
       "no-change",
       checkDiagnostics: checkDiagnostics,
       expectingRemarks: [
+        "Disabling incremental cross-module building",
         "Incremental compilation: May skip current input:  {compile: main.o <= main.swift}",
         "Incremental compilation: May skip current input:  {compile: other.o <= other.swift}",
         "Incremental compilation: Skipping input:  {compile: main.o <= main.swift}",
@@ -465,6 +467,7 @@ final class IncrementalCompilationTests: XCTestCase {
       "non-propagating",
       checkDiagnostics: checkDiagnostics,
       expectingRemarks: [
+        "Disabling incremental cross-module building",
         "Incremental compilation: May skip current input:  {compile: main.o <= main.swift}",
         "Incremental compilation: Scheduing changed input  {compile: other.o <= other.swift}",
         "Incremental compilation: Queuing (initial):  {compile: other.o <= other.swift}",
@@ -489,6 +492,7 @@ final class IncrementalCompilationTests: XCTestCase {
       "non-propagating, both touched",
       checkDiagnostics: checkDiagnostics,
       expectingRemarks: [
+        "Disabling incremental cross-module building",
         "Incremental compilation: Scheduing changed input  {compile: main.o <= main.swift}",
         "Incremental compilation: Scheduing changed input  {compile: other.o <= other.swift}",
         "Incremental compilation: Queuing (initial):  {compile: main.o <= main.swift}",
@@ -514,6 +518,7 @@ final class IncrementalCompilationTests: XCTestCase {
       "propagating into 2nd wave",
       checkDiagnostics: checkDiagnostics,
       expectingRemarks: [
+        "Disabling incremental cross-module building",
         "Incremental compilation: Scheduing changed input  {compile: main.o <= main.swift}",
         "Incremental compilation: May skip current input:  {compile: other.o <= other.swift}",
         "Incremental compilation: Queuing (initial):  {compile: main.o <= main.swift}",
@@ -548,6 +553,7 @@ final class IncrementalCompilationTests: XCTestCase {
       checkDiagnostics: checkDiagnostics,
       extraArguments: [extraArgument],
       expectingRemarks: [
+        "Disabling incremental cross-module building",
         "Incremental compilation: May skip current input:  {compile: other.o <= other.swift}",
         "Incremental compilation: Queuing (initial):  {compile: main.o <= main.swift}",
         "Incremental compilation: scheduling dependents of main.swift; -driver-always-rebuild-dependents",