Clean Up Some Data Structures a Bit

Sources/SwiftDriver/IncrementalCompilation/BidirectionalMap.swift

@@ -10,9 +10,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-/// Like a two-way dictionary
+/// Provides a bidirectional mapping between two keys.
 ///
-public struct BidirectionalMap<T1: Hashable, T2: Hashable>: Equatable, Sequence {
+/// `BidirectionalMap` provides efficient O(1) lookups in both directions.
+public struct BidirectionalMap<T1: Hashable, T2: Hashable>: Equatable {
   private var map1: [T1: T2] = [:]
   private var map2: [T2: T1] = [:]
 
@@ -63,40 +64,53 @@ public struct BidirectionalMap<T1: Hashable, T2: Hashable>: Equatable, Sequence
       }
     }
   }
+}
 
-  public func contains(key: T1) -> Bool {
-    map1.keys.contains(key)
-  }
-  public func contains(key: T2) -> Bool {
-    map2.keys.contains(key)
-  }
-
+extension BidirectionalMap {
+  /// Updates the value stored in the bidirectional map for the given key,
+  /// or adds a new set of key-value pairs if the key have an entry in the map.
+  ///
+  /// If access to the old value is not necessary, it is more efficient to use
+  /// the subscript operator to perform an in-place update.
+  ///
+  /// - Parameters:
+  ///   - v: The new value to add to the two-level map.
+  ///   - key: The two-level key to associate with value.
+  /// - Returns: The value that was replaced, or `nil` if a new key-value pair was added.
+  @discardableResult
   public mutating func updateValue(_ newValue: T2, forKey key: T1) -> T2? {
-    let oldValue = map1.updateValue(newValue, forKey: key)
-    _ = oldValue.map {map2.removeValue(forKey: $0)}
-    map2[newValue] = key
-    return oldValue
+    let old = self[key]
+    self[key] = newValue
+    return old
   }
+
+  /// Updates the value stored in the bidirectional map for the given key,
+  /// or adds a new set of key-value pairs if the key have an entry in the map.
+  ///
+  /// If access to the old value is not necessary, it is more efficient to use
+  /// the subscript operator to perform an in-place update.
+  ///
+  /// - Parameters:
+  ///   - v: The new value to add to the two-level map.
+  ///   - key: The two-level key to associate with value.
+  /// - Returns: The value that was replaced, or `nil` if a new key-value pair was added.
+  @discardableResult
   public mutating func updateValue(_ newValue: T1, forKey key: T2) -> T1? {
-    let oldValue = map2.updateValue(newValue, forKey: key)
-   _ = oldValue.map {map1.removeValue(forKey: $0)}
-    map1[newValue] = key
-    return oldValue
+    let old = self[key]
+    self[key] = newValue
+    return old
   }
+}
 
-  public mutating func removeValue(forKey t1: T1) {
-    if let t2 = map1[t1] {
-      map2.removeValue(forKey: t2)
-    }
-    map1.removeValue(forKey: t1)
-  }
-  public mutating func removeValue(forKey t2: T2) {
-    if let t1 = map2[t2] {
-      map1.removeValue(forKey: t1)
-    }
-    map2.removeValue(forKey: t2)
-  }
+extension BidirectionalMap: Sequence {
+  /// Provides an iterator that yields pairs of the key-to-key mappings.
+  ///
+  /// - Warning: The order of the returned mappings is not stable. In general,
+  ///            avoid iterating over a bidirectional map unless order does not
+  ///            matter for the algorithm in question.
+  ///
+  /// - Returns: An iterator value for this bidirectional map.
   public func makeIterator() -> Dictionary<T1, T2>.Iterator {
-    map1.makeIterator()
+    self.map1.makeIterator()
   }
 }

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/InputDependencySourceMap.swift

@@ -12,14 +12,13 @@ import Foundation
 import TSCBasic
 
 @_spi(Testing) public struct InputDependencySourceMap: Equatable {
+  public typealias BiMap = BidirectionalMap<TypedVirtualPath, DependencySource>
 
   /// Maps input files (e.g. .swift) to and from the DependencySource object.
   ///
-  // This map caches the same information as in the `OutputFileMap`, but it
-  // optimizes the reverse lookup, and includes path interning via `DependencySource`.
-  // Once created, it does not change.
-
-  public typealias BiMap = BidirectionalMap<TypedVirtualPath, DependencySource>
+  /// This map caches the same information as in the `OutputFileMap`, but it
+  /// optimizes the reverse lookup, and includes path interning via `DependencySource`.
+  /// Once created, it does not change.
   @_spi(Testing) public let biMap: BiMap
 
   /// Based on entries in the `OutputFileMap`, create the bidirectional map to map each source file

Sources/SwiftDriver/IncrementalCompilation/TwoDMap.swift

@@ -86,9 +86,4 @@ public struct TwoDMap<Key1: Hashable, Key2: Hashable, Value: Equatable>: Mutable
     }
     return true
   }
-
-  public func compactMap<R>(_ fn: ((Key1, Key2), Value) -> R?) -> [R]
-  {
-    map1.compactMap(fn)
-  }
 }

Tests/SwiftDriverTests/BidirectionalMapTests.swift

@@ -14,7 +14,6 @@ import XCTest
 import SwiftDriver
 
 class BidirectionalMapTests: XCTestCase {
-
   func testBiDiMap() {
     func test(_ biMapToTest: BidirectionalMap<Int, String>) {
       zip(biMapToTest.map{$0}.sorted {$0.0 < $1.0}, testContents).forEach {
@@ -24,10 +23,10 @@ class BidirectionalMapTests: XCTestCase {
       for (i, s) in testContents.map({$0}) {
         XCTAssertEqual(biMapToTest[i], s)
         XCTAssertEqual(biMapToTest[s], i)
-        XCTAssertTrue(biMapToTest.contains(key: i))
-        XCTAssertTrue(biMapToTest.contains(key: s))
-        XCTAssertFalse(biMapToTest.contains(key: -1))
-        XCTAssertFalse(biMapToTest.contains(key: "gazorp"))
+        XCTAssertNotNil(biMapToTest[i])
+        XCTAssertNotNil(biMapToTest[s])
+        XCTAssertNil(biMapToTest[-1])
+        XCTAssertNil(biMapToTest["gazorp"])
       }
     }
 
@@ -37,15 +36,15 @@ class BidirectionalMapTests: XCTestCase {
       biMap[i] = s
     }
     test(biMap)
-    biMap.removeValue(forKey: testContents.count)
+    biMap[testContents.count] = nil
     test(biMap)
-    biMap.removeValue(forKey: "gazorp")
+    biMap["gazorp"] = nil
     test(biMap)
 
     let removed = testContents.removeFirst()
     var biMap2 = biMap
-    biMap.removeValue(forKey: removed.0)
-    biMap2.removeValue(forKey: removed.1)
+    biMap[removed.0] = nil
+    biMap2[removed.1] = nil
     test(biMap)
     test(biMap2)
   }