Move accessors

Author: David Ungar

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift

@@ -58,15 +58,16 @@ import SwiftOptions
                                        function: String = #function,
                                        file: String = #file,
                                        line: Int = #line) -> DependencySource {
-    guard let source = inputDependencySourceMap[input] else {
+    guard let source = inputDependencySourceMap.getSource(for: input)
+    else {
       fatalError("\(input.file.basename) not found in inputDependencySourceMap, \(file):\(line) in \(function)")
     }
     return source
   }
   @_spi(Testing) public func getInput(for source: DependencySource) -> TypedVirtualPath? {
     guard let input =
             info.simulateGetInputFailure ? nil
-            : inputDependencySourceMap[source]
+            : inputDependencySourceMap.getInput(for: source)
     else {
       info.diagnosticEngine.emit(warning: "Failed to find source file for '\(source.file.basename)', recovering with a full rebuild. Next build will be incremental.")
       info.reporter?.report(
@@ -172,10 +173,10 @@ extension ModuleDependencyGraph {
     return allDependencySourcesToRecompile.compactMap {
       depedencySource in
       guard depedencySource != changedSource else {return nil}
-      let dependentSource = inputDependencySourceMap[depedencySource]
+      let dependentInput = inputDependencySourceMap.getInput(for: depedencySource)
       info.reporter?.report(
-        "Found dependent of \(input.file.basename):", dependentSource)
-      return dependentSource
+        "Found dependent of \(input.file.basename):", dependentInput)
+      return dependentInput
     }
   }
 
@@ -192,7 +193,7 @@ extension ModuleDependencyGraph {
   /// Does the graph contain any dependency nodes for a given source-code file?
   func containsNodes(forSourceFile file: TypedVirtualPath) -> Bool {
     precondition(file.type == .swift)
-    guard let source = inputDependencySourceMap[file] else {
+    guard let source = inputDependencySourceMap.getSource(for: file) else {
       return false
     }
     return containsNodes(forDependencySource: source)
@@ -803,7 +804,7 @@ extension ModuleDependencyGraph {
         }
       }
 
-      for (input, dependencySource) in graph.inputDependencySourceMap {
+      graph.inputDependencySourceMap.enumerateToSerialize { input, dependencySource in
         self.addIdentifier(input.file.name)
         self.addIdentifier(dependencySource.file.name)
       }
@@ -948,7 +949,8 @@ extension ModuleDependencyGraph {
             }
           }
         }
-        for (input, dependencySource) in graph.inputDependencySourceMap {
+        graph.inputDependencySourceMap.enumerateToSerialize {
+          input, dependencySource in
           serializer.stream.writeRecord(serializer.abbreviations[.mapNode]!) {
             $0.append(RecordID.mapNode)
             $0.append(serializer.lookupIdentifierCode(for: input.file.name))

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/InputDependencySourceMap.swift

@@ -11,7 +11,7 @@
 import Foundation
 import TSCBasic
 
-@_spi(Testing) public struct InputDependencySourceMap: Equatable, Sequence {
+@_spi(Testing) public struct InputDependencySourceMap: Equatable {
 
   /// Maps input files (e.g. .swift) to and from the DependencySource object.
   ///
@@ -29,29 +29,30 @@ import TSCBasic
 
   public typealias BiMap = BidirectionalMap<TypedVirtualPath, DependencySource>
   @_spi(Testing) public var biMap = BiMap()
-  
-  @_spi(Testing) public subscript(input: TypedVirtualPath) -> DependencySource? {
-    get { biMap[input] }
-    set { biMap[input] = newValue }
-  }
-  
-  @_spi(Testing) public private(set) subscript(dependencySource: DependencySource) -> TypedVirtualPath? {
-    get { biMap[dependencySource] }
-    set { biMap[dependencySource] = newValue }
+
+  private mutating func addMapEntry(_ input: TypedVirtualPath, _ dependencySource: DependencySource) {
+    assert(input.type == .swift && dependencySource.typedFile.type == .swiftDeps)
+    biMap[input] = dependencySource
   }
+}
 
-  public func makeIterator() -> BiMap.Iterator {
-    biMap.makeIterator()
+// MARK: - Accessing
+extension InputDependencySourceMap {
+  @_spi(Testing) public func getSource(for input: TypedVirtualPath
+  ) -> DependencySource? {
+    biMap[input]
   }
-  
-  public func getInputForReportingPath(_ source: DependencySource
-  )  -> TypedVirtualPath? {
+
+  @_spi(Testing) public func getInput(for source: DependencySource) -> TypedVirtualPath? {
     biMap[source]
   }
-  
-  private mutating func addMapEntry(_ input: TypedVirtualPath, _ dependencySource: DependencySource) {
-    assert(input.type == .swift && dependencySource.typedFile.type == .swiftDeps)
-    biMap[input] = dependencySource
+
+  @_spi(Testing) public func enumerateToSerialize(
+    _ eachFn: (TypedVirtualPath, DependencySource) -> Void
+  ) {
+    for (input, dependencySource) in biMap {
+      eachFn(input, dependencySource)
+    }
   }
 }
 

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/Tracer.swift

@@ -121,7 +121,7 @@ extension ModuleDependencyGraph.Tracer {
         path.compactMap { node in
           node.dependencySource.map {
             source in
-            graph.inputDependencySourceMap.getInputForReportingPath(source).map {
+            graph.inputDependencySourceMap.getInput(for: source).map {
               input in
               "\(node.key) in \(input.file.basename)"
             }