Merge pull request #385 from davidungar/allow-for-build-record-to-have-relative-path

[Incremental] Allow build record to reside at a relative path

Author: David Ungar

Sources/SwiftDriver/Driver/Driver.swift

@@ -436,6 +436,7 @@ public struct Driver {
     self.buildRecordInfo = BuildRecordInfo(
       actualSwiftVersion: self.frontendTargetInfo.compilerVersion,
       compilerOutputType: compilerOutputType,
+      workingDirectory: self.workingDirectory ?? fileSystem.currentWorkingDirectory,
       diagnosticEngine: diagnosticEngine,
       fileSystem: fileSystem,
       moduleOutputInfo: moduleOutputInfo,

Sources/SwiftDriver/Driver/OutputFileMap.swift

@@ -246,10 +246,3 @@ extension String {
     return self + "." + ext
   }
 }
-
-extension VirtualPath {
-  fileprivate func resolvedRelativePath(base: AbsolutePath) -> VirtualPath {
-    guard case let .relative(relPath) = self else { return self }
-    return .absolute(.init(base, relPath))
-  }
-}

Sources/SwiftDriver/Incremental Compilation/BuildRecordInfo.swift

@@ -30,6 +30,7 @@ import SwiftOptions
   init?(
     actualSwiftVersion: String,
     compilerOutputType: FileType?,
+    workingDirectory: AbsolutePath?,
     diagnosticEngine: DiagnosticsEngine,
     fileSystem: FileSystem,
     moduleOutputInfo: ModuleOutputInfo,
@@ -41,6 +42,7 @@ import SwiftOptions
     guard let buildRecordPath = Self.computeBuildRecordPath(
             outputFileMap: outputFileMap,
             compilerOutputType: compilerOutputType,
+            workingDirectory: workingDirectory,
             diagnosticEngine: diagnosticEngine)
     else {
       return nil
@@ -80,6 +82,7 @@ import SwiftOptions
   private static func computeBuildRecordPath(
     outputFileMap: OutputFileMap?,
     compilerOutputType: FileType?,
+    workingDirectory: AbsolutePath?,
     diagnosticEngine: DiagnosticsEngine
   ) -> VirtualPath? {
     // FIXME: This should work without an output file map. We should have
@@ -93,7 +96,9 @@ import SwiftOptions
       diagnosticEngine.emit(.warning_incremental_requires_build_record_entry)
       return nil
     }
-    return partialBuildRecordPath
+    return workingDirectory
+      .map(partialBuildRecordPath.resolvedRelativePath(base:))
+      ?? partialBuildRecordPath
   }
 
   /// Write out the build record.

Sources/SwiftDriver/Utilities/VirtualPath.swift

@@ -346,6 +346,14 @@ extension VirtualPath {
   }
 }
 
+extension VirtualPath {
+  /// Resolve a relative path into an absolute one, if possible.
+  public func resolvedRelativePath(base: AbsolutePath) -> VirtualPath {
+    guard case let .relative(relPath) = self else { return self }
+    return .absolute(.init(base, relPath))
+  }
+}
+
 private extension String {
   func withoutExt(_ ext: String?) -> String {
     if let ext = ext {