Merge pull request #507 from davidungar/retrench

[Incremental] Improve printing for debugging

Author: David Ungar

Sources/SwiftDriver/IncrementalCompilation/DependencyGraphDotFileWriter.swift

@@ -66,7 +66,7 @@ fileprivate protocol ExportableGraph {
 
 extension SourceFileDependencyGraph: ExportableGraph {
  fileprivate var graphID: String {
- return try! VirtualPath(path: sourceFileName ?? "anonymous").basename
+ return try! VirtualPath(path: sourceFileName).basename
  }
  fileprivate func forEachExportableNode<Node: ExportableNode>(_ visit: (Node) -> Void) {
  forEachNode { visit($0 as! Node) }

Sources/SwiftDriver/IncrementalCompilation/DependencyKey.swift

@@ -22,7 +22,11 @@ import TSCBasic
 
  /*@_spi(Testing)*/ public init(_ fileName: String)
  throws {
- self.file = try VirtualPath(path: fileName)
+ self.init(try VirtualPath(path: fileName))
+ }
+
+ init(_ file: VirtualPath) {
+ self.file = file
  self.isSwiftModule = file.extension == FileType.swiftModule.rawValue
  }
 
@@ -35,7 +39,13 @@ import TSCBasic
  }
 
  public var description: String {
- file.name
+ switch file.extension {
+ case FileType.swiftModule.rawValue:
+ // Swift modules have an extra component at the end that is not descriptive
+ return file.parentDirectory.basename
+ default:
+ return file.basename
+ }
  }
 
  public var shortDescription: String {

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraph.swift

@@ -313,7 +313,7 @@ extension ModuleDependencyGraph {
  fed.incrementalDependencySource?
  .read(in: info.fileSystem, reporter: info.reporter)
  .map { unserializedDepGraph in
- info.reporter?.report("Integrating changes from", fed.externalDependency.file)
+ info.reporter?.report("Integrating changes from: \(fed.externalDependency)")
  return Integrator.integrate(
  from: unserializedDepGraph,
  into: self,

Sources/SwiftDriver/IncrementalCompilation/ModuleDependencyGraphParts/DependencySource.swift

@@ -42,7 +42,7 @@ public struct DependencySource: Hashable, CustomStringConvertible {
  public var file: VirtualPath { typedFile.file }
 
  public var description: String {
- file.description
+ ExternalDependency(file).description
  }
 }
 

Sources/SwiftDriver/IncrementalCompilation/SourceFileDependencyGraph.swift

@@ -48,8 +48,8 @@ import TSCUtility
  }
  }
 
- public var sourceFileName: String? {
- sourceFileNodePair.interface.key.designator.name
+ public var sourceFileName: String {
+ dependencySource.file.name
  }
 
  @discardableResult public func verify() -> Bool {