Only make input paths absolute when -working-directory is passed

Author: rmaz

Sources/SwiftDriver/Driver/Driver.swift

@@ -329,7 +329,8 @@ public struct Driver {
     case .absolute(let path):
       return path
     case .relative(let path):
-      return workingDirectory.map { AbsolutePath($0, path) }
+      let cwd = workingDirectory ?? fileSystem.currentWorkingDirectory
+      return cwd.map { AbsolutePath($0, path) }
     case .standardInput, .standardOutput, .temporary, .temporaryWithKnownContents, .fileList:
       fatalError("Frontend target information will never include a path of this type.")
     }
@@ -688,14 +689,14 @@ public struct Driver {
                                                                                         compilerMode: compilerMode)
 
     // Compute the working directory.
-    let cwd = fileSystem.currentWorkingDirectory
-    workingDirectory = try parsedOptions.getLastArgument(.workingDirectory).map { workingDirectoryArg in
+    self.workingDirectory = try parsedOptions.getLastArgument(.workingDirectory).map { workingDirectoryArg in
+      let cwd = fileSystem.currentWorkingDirectory
       return try cwd.map{ try AbsolutePath(validating: workingDirectoryArg.asSingle, relativeTo: $0) } ?? AbsolutePath(validating: workingDirectoryArg.asSingle)
-    } ?? cwd
-
-    // Apply the working directory to the parsed options.
-    if let workingDirectory = self.workingDirectory {
-      try Self.applyWorkingDirectory(workingDirectory, to: &self.parsedOptions)
+    }
+    
+    if let specifiedWorkingDir = self.workingDirectory {
+      // Apply the working directory to the parsed options if passed explicitly.
+      try Self.applyWorkingDirectory(specifiedWorkingDir, to: &self.parsedOptions)
     }
 
     let staticExecutable = parsedOptions.hasFlag(positive: .staticExecutable,
@@ -776,6 +777,8 @@ public struct Driver {
       }
 
       if let workingDirectory = self.workingDirectory {
+        // Input paths are prefixed with the working directory when specified,
+        // apply the same logic to the output file map keys.
         self.outputFileMap = outputFileMap?.resolveRelativePaths(relativeTo: workingDirectory)
       } else {
         self.outputFileMap = outputFileMap
@@ -854,7 +857,7 @@ public struct Driver {
     self.buildRecordInfo = BuildRecordInfo(
       actualSwiftVersion: self.frontendTargetInfo.compilerVersion,
       compilerOutputType: compilerOutputType,
-      workingDirectory: self.workingDirectory,
+      workingDirectory: self.workingDirectory ?? fileSystem.currentWorkingDirectory,
       diagnosticEngine: diagnosticEngine,
       fileSystem: fileSystem,
       moduleOutputInfo: moduleOutputInfo,
@@ -3099,7 +3102,7 @@ extension Driver {
     }
 
     if let profileArgs = parsedOptions.getLastArgument(.profileUse)?.asMultiple,
-       let workingDirectory = workingDirectory {
+       let workingDirectory = workingDirectory ?? fileSystem.currentWorkingDirectory {
       for profilingData in profileArgs {
         if let path = try? AbsolutePath(validating: profilingData,
                                           relativeTo: workingDirectory) {

Sources/SwiftDriver/ExplicitModuleBuilds/ModuleDependencyScanning.swift

@@ -184,7 +184,7 @@ public extension Driver {
 
     if supportInProcessSwiftScanQueries {
       var scanDiagnostics: [ScannerDiagnosticPayload] = []
-      guard let cwd = workingDirectory else {
+      guard let cwd = workingDirectory ?? fileSystem.currentWorkingDirectory else {
         throw DependencyScanningError.dependencyScanFailed("cannot determine working directory")
       }
       var command = try Self.itemizedJobCommand(of: preScanJob,
@@ -260,7 +260,7 @@ public extension Driver {
 
     if supportInProcessSwiftScanQueries {
       var scanDiagnostics: [ScannerDiagnosticPayload] = []
-      guard let cwd = workingDirectory else {
+      guard let cwd = workingDirectory ?? fileSystem.currentWorkingDirectory else {
         throw DependencyScanningError.dependencyScanFailed("cannot determine working directory")
       }
       var command = try Self.itemizedJobCommand(of: scannerJob,
@@ -298,7 +298,7 @@ public extension Driver {
 
     if supportInProcessSwiftScanQueries {
       var scanDiagnostics: [ScannerDiagnosticPayload] = []
-      guard let cwd = workingDirectory else {
+      guard let cwd = workingDirectory ?? fileSystem.currentWorkingDirectory else {
         throw DependencyScanningError.dependencyScanFailed("cannot determine working directory")
       }
       var command = try Self.itemizedJobCommand(of: batchScanningJob,

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -401,7 +401,7 @@ extension Driver {
       if let compilationDir = parsedOptions.getLastArgument(.fileCompilationDir)?.asSingle {
         let compDirPath = try VirtualPath.intern(path: compilationDir)
         try addPathArgument(VirtualPath.lookup(compDirPath), to:&commandLine, remap: jobNeedPathRemap)
-      } else if let cwd = workingDirectory {
+      } else if let cwd = workingDirectory ?? fileSystem.currentWorkingDirectory {
         let compDirPath = VirtualPath.absolute(cwd)
         try addPathArgument(compDirPath, to:&commandLine, remap: jobNeedPathRemap)
       }
@@ -837,7 +837,7 @@ extension Driver {
 
 extension Driver {
   private func getAbsolutePathFromVirtualPath(_ path: VirtualPath) -> AbsolutePath? {
-    guard let cwd = workingDirectory else {
+    guard let cwd = workingDirectory ?? fileSystem.currentWorkingDirectory else {
       return nil
     }
     return path.resolvedRelativePath(base: cwd).absolutePath

Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift

@@ -186,7 +186,7 @@ extension Driver {
                                                              fileSystem: FileSystem,
                                                              workingDirectory: AbsolutePath?,
                                                              invocationCommand: [String]) throws -> FrontendTargetInfo {
-    let cwd = try workingDirectory ?? fileSystem.tempDirectory
+    let cwd = try workingDirectory ?? fileSystem.currentWorkingDirectory ?? fileSystem.tempDirectory
     let compilerExecutablePath = try toolchain.resolvedTool(.swiftCompiler).path
     let targetInfoData =
     try libSwiftScanInstance.queryTargetInfoJSON(workingDirectory: cwd,

Sources/SwiftDriver/Utilities/VirtualPath.swift

@@ -389,7 +389,7 @@ extension VirtualPath {
     }
 
     fileprivate func intern(virtualPath path: VirtualPath) -> VirtualPath.Handle {
-      return self.queue.sync(flags: .barrier) {
+      return self.queue.sync(flags: .barrier) {       
         guard let idx = self.uniquer[path.cacheKey] else {
           let nextSlot = self.table.count
           self.uniquer[path.cacheKey] = .init(nextSlot)