fixup after rebasing

Author: David Ungar

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift

@@ -139,11 +139,8 @@ extension ModuleDependencyGraph {
   }
 
   public func integrate(sourceGraph: SourceFileDependencyGraph) -> Set<Node>? {
-    let results = Integrator.integrateAndCollectExternalDepNodes(
-      from: sourceGraph,
-      into: self,
-      isCrossModuleIncrementalBuildEnabled: isCrossModuleIncrementalBuildEnabled
-    )
+    let results = Integrator.integrateAndCollectExternalDepNodes(from: sourceGraph,
+                                                                 into: self)
     guard let externallyCausedChanges =
             integrate(discoveredExternalDependencies: results.discoveredExternalDependencies)
     else {
@@ -200,8 +197,8 @@ extension ModuleDependencyGraph {
     }
     let results = Integrator.integrateAndCollectExternalDepNodes(
       from: sourceGraph,
-      into: self,
-      options: graph.options
+      into: self
+    )
     return results
   }
 
@@ -890,7 +887,7 @@ extension ModuleDependencyGraph {
                         for: fingerprintedExternalDependency.externalDependency.fileName))
             $0.append((fingerprintedExternalDependency.fingerprint != nil) ? UInt32(1) : UInt32(0))
           }, 
-          blob: (fingerprintedExternalDependency ?? ""))
+          blob: (fingerprintedExternalDependency.fingerprint ?? ""))
         }
       }
       return ByteString(serializer.stream.data)

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/DependencySource.swift

@@ -21,41 +21,43 @@ public struct DependencySource: Hashable, CustomStringConvertible {
 
   init(_ typedFile: TypedVirtualPath) {
     assert( typedFile.type == .swiftDeps ||
-              typedFile.type == .swiftModule
-      )
+            typedFile.type == .swiftModule)
       self.typedFile = typedFile
-    }
-    init(_ file: VirtualPath) {
-      let ext = file.extension
-      let typeIfExpected =
-        ext == FileType.swiftDeps  .rawValue ? FileType.swiftDeps :
-        ext == FileType.swiftModule.rawValue ? FileType.swiftModule
-        : nil
-      guard let type = typeIfExpected else {
-        fatalError("unexpected dependencySource extension: \(String(describing: ext))")
-      }
-      self.init(TypedVirtualPath(file: file, type: type))
-    }
-    /*@_spi(Testing)*/ public init(mock i: Int) {
-      self.init(try! VirtualPath(path: String(i) + "." + FileType.swiftDeps.rawValue))
-    }
-    /*@_spi(Testing)*/ public var mockID: Int {
-       Int(file.basenameWithoutExt)!
+  }
+
+  /*@_spi(Testing)*/
+  public init(_ file: VirtualPath) {
+    let ext = file.extension
+    let typeIfExpected =
+      ext == FileType.swiftDeps  .rawValue ? FileType.swiftDeps :
+      ext == FileType.swiftModule.rawValue ? FileType.swiftModule
+      : nil
+    guard let type = typeIfExpected else {
+      fatalError("unexpected dependencySource extension: \(String(describing: ext))")
     }
     self.init(TypedVirtualPath(file: file, type: type))
   }
+
+  var file: VirtualPath { typedFile.file }
+
+  public var description: String {
+    file.description
+  }
+}
+
+// MARK: - mocking
+extension DependencySource {
   /*@_spi(Testing)*/ public init(mock i: Int) {
     self.init(try! VirtualPath(path: String(i) + "." + FileType.swiftDeps.rawValue))
   }
+
   /*@_spi(Testing)*/ public var mockID: Int {
     Int(file.basenameWithoutExt)!
   }
-  var file: VirtualPath { typedFile.file }
-
-  public var description: String {
-    file.description
-  }
+}
 
+// MARK: - reading
+extension DependencySource {
   /// Throws if a read error
   /// Returns nil if no dependency info there.
   public func read(

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/Integrator.swift

@@ -39,13 +39,13 @@ extension ModuleDependencyGraph {
     /// After integration is complete, contains the nodes that have disappeared.
     var disappearedNodes = [DependencyKey: Graph.Node]()
 
-    init(source: SourceFileDependencyGraph,
-         dependencySource: DependencySource,
+    init(sourceGraph: SourceFileDependencyGraph,
          destination: ModuleDependencyGraph)
     {
       self.sourceGraph = sourceGraph
-      self.destination = destination
-      self.disappearedNodes = destination.nodeFinder.findNodes(for: dependencySource)
+      self .destination = destination
+      self.disappearedNodes = destination.nodeFinder
+        .findNodes(for: sourceGraph.dependencySource)
         ?? [:]
     }
 
@@ -62,11 +62,9 @@ extension ModuleDependencyGraph.Integrator {
   /// Returns changed nodes
   /*@_spi(Testing)*/ static func integrateAndCollectExternalDepNodes(
     from g: SourceFileDependencyGraph,
-    dependencySource: Graph.DependencySource,
     into destination: Graph
   ) -> Results {
-    var integrator = Self(source: g,
-                          dependencySource: dependencySource,
+    var integrator = Self(sourceGraph: g,
                           destination: destination)
     integrator.integrate()