Respect -driver-use-frontend-path throughout job creation

Sources/SwiftDriver/Driver/Driver.swift

@@ -44,6 +44,7 @@ public struct Driver {
     case invalidDriverName(String)
     case invalidInput(String)
     case subcommandPassedToDriver
+    case relativeFrontendPath(String)
   }
 
   /// The set of environment variables that are visible to the driver and
@@ -70,7 +71,7 @@ public struct Driver {
   var parsedOptions: ParsedOptions
 
   /// The Swift compiler executable.
-  public let swiftCompiler: VirtualPath
+  public let swiftCompiler: AbsolutePath
 
   /// Extra command-line arguments to pass to the Swift compiler.
   public let swiftCompilerPrefixArgs: [String]
@@ -224,13 +225,13 @@ public struct Driver {
       let frontendCommandLine = frontendPath.asSingle.split(separator: ";").map { String($0) }
       if frontendCommandLine.isEmpty {
         self.diagnosticEngine.emit(.error_no_swift_frontend)
-        self.swiftCompiler = .absolute(try self.toolchain.getToolPath(.swiftCompiler))
+        self.swiftCompiler = try self.toolchain.getToolPath(.swiftCompiler)
       } else {
-        self.swiftCompiler = try VirtualPath(path: frontendCommandLine.first!)
+        self.swiftCompiler = try AbsolutePath(validating: frontendCommandLine.first!)
       }
       self.swiftCompilerPrefixArgs = Array(frontendCommandLine.dropFirst())
     } else {
-      self.swiftCompiler = .absolute(try self.toolchain.getToolPath(.swiftCompiler))
+      self.swiftCompiler = try self.toolchain.getToolPath(.swiftCompiler)
       self.swiftCompilerPrefixArgs = []
     }
 
@@ -286,7 +287,8 @@ public struct Driver {
       moduleOutput: self.moduleOutput,
       inputFiles: inputFiles,
       diagnosticEngine: diagnosticEngine,
-      actualSwiftVersion: try? toolchain.swiftCompilerVersion()
+      actualSwiftVersion:
+        try? toolchain.swiftCompilerVersion(self.swiftCompiler)
     )
 
     self.sdkPath = Self.computeSDKPath(&parsedOptions, compilerMode: compilerMode, toolchain: toolchain, diagnosticsEngine: diagnosticEngine, env: env)
@@ -296,7 +298,10 @@ public struct Driver {
                                                                                importedObjCHeader: importedObjCHeader,
                                                                                outputFileMap: outputFileMap)
 
-    self.enabledSanitizers = try Self.parseSanitizerArgValues(&parsedOptions, diagnosticEngine: diagnosticEngine, toolchain: toolchain, targetTriple: targetTriple)
+    self.enabledSanitizers = try Self.parseSanitizerArgValues(
+      &parsedOptions, diagnosticEngine: diagnosticEngine,
+      toolchain: toolchain, targetTriple: targetTriple,
+      swiftCompiler: swiftCompiler)
 
     // Supplemental outputs.
     self.dependenciesFilePath = try Self.computeSupplementaryOutputPath(
@@ -557,7 +562,6 @@ extension Driver {
   ) throws {
     // We just need to invoke the corresponding tool if the kind isn't Swift compiler.
     guard driverKind.isSwiftCompiler else {
-      let swiftCompiler = try getSwiftCompilerPath()
       return try exec(path: swiftCompiler.pathString, args: driverKind.usageArgs + parsedOptions.commandLine)
     }
 
@@ -603,12 +607,6 @@ extension Driver {
     try jobExecutor.execute(env: env)
   }
 
-  /// Returns the path to the Swift binary.
-  func getSwiftCompilerPath() throws -> AbsolutePath {
-    // FIXME: This is very preliminary. Need to figure out how to get the actual Swift executable path.
-    try toolchain.getToolPath(.swiftCompiler)
-  }
-
   public mutating func createToolExecutionDelegate() -> ToolExecutionDelegate {
     var mode: ToolExecutionDelegate.Mode = .regular
 
@@ -1018,7 +1016,8 @@ extension Driver {
     _ parsedOptions: inout ParsedOptions,
     diagnosticEngine: DiagnosticsEngine,
     toolchain: Toolchain,
-    targetTriple: Triple
+    targetTriple: Triple,
+    swiftCompiler: AbsolutePath
   ) throws -> Set<Sanitizer> {
 
     var set = Set<Sanitizer>()
@@ -1043,6 +1042,7 @@ extension Driver {
         for: sanitizer,
         targetTriple: targetTriple,
         parsedOptions: &parsedOptions,
+        swiftCompiler: swiftCompiler,
         isShared: sanitizer != .fuzzer
       )
 

Sources/SwiftDriver/Jobs/CompileJob.swift

@@ -154,7 +154,7 @@ extension Driver {
 
     return Job(
       kind: .compile,
-      tool: swiftCompiler,
+      tool: .absolute(swiftCompiler),
       commandLine: commandLine,
       displayInputs: primaryInputs,
       inputs: inputs,

Sources/SwiftDriver/Jobs/DarwinToolchain+LinkerSupport.swift

@@ -12,8 +12,9 @@
 import TSCBasic
 
 extension DarwinToolchain {
-  private func findARCLiteLibPath() throws -> AbsolutePath? {
-    let path = try getToolPath(.swiftCompiler)
+  private func findARCLiteLibPath(swiftCompiler: AbsolutePath) throws
+      -> AbsolutePath? {
+    let path = swiftCompiler
       .parentDirectory // 'swift'
       .parentDirectory // 'bin'
       .appending(components: "lib", "arc")
@@ -35,6 +36,7 @@ extension DarwinToolchain {
     to commandLine: inout [Job.ArgTemplate],
     parsedOptions: inout ParsedOptions,
     targetTriple: Triple,
+    swiftCompiler: AbsolutePath,
     darwinLibName: String
   ) throws {
     // Adding the rpaths might negatively interact when other rpaths are involved,
@@ -52,7 +54,9 @@ extension DarwinToolchain {
     // from the default location without copying.
 
 
-    let clangPath = try clangLibraryPath(for: targetTriple, parsedOptions: &parsedOptions)
+    let clangPath = try clangLibraryPath(
+      for: targetTriple, swiftCompiler: swiftCompiler,
+      parsedOptions: &parsedOptions)
     commandLine.appendFlag("-rpath")
     commandLine.appendPath(clangPath)
   }
@@ -61,6 +65,7 @@ extension DarwinToolchain {
     to commandLine: inout [Job.ArgTemplate],
     parsedOptions: inout ParsedOptions,
     targetTriple: Triple,
+    swiftCompiler: AbsolutePath,
     sanitizer: Sanitizer,
     isShared: Bool
   ) throws {
@@ -79,14 +84,16 @@ extension DarwinToolchain {
       named: sanitizerName,
       to: &commandLine,
       for: targetTriple,
-      parsedOptions: &parsedOptions
+      parsedOptions: &parsedOptions,
+      swiftCompiler: swiftCompiler
     )
 
     if isShared {
       try addLinkRuntimeLibraryRPath(
         to: &commandLine,
         parsedOptions: &parsedOptions,
         targetTriple: targetTriple,
+        swiftCompiler: swiftCompiler,
         darwinLibName: sanitizerName
       )
     }
@@ -95,10 +102,12 @@ extension DarwinToolchain {
   private func addProfileGenerationArgs(
     to commandLine: inout [Job.ArgTemplate],
     parsedOptions: inout ParsedOptions,
-    targetTriple: Triple
+    targetTriple: Triple,
+    swiftCompiler: AbsolutePath
   ) throws {
     guard parsedOptions.hasArgument(.profileGenerate) else { return }
     let clangPath = try clangLibraryPath(for: targetTriple,
+                                         swiftCompiler: swiftCompiler,
                                          parsedOptions: &parsedOptions)
 
     let runtime = targetTriple.darwinPlatform!.libraryNameSuffix
@@ -141,6 +150,7 @@ extension DarwinToolchain {
   private func addArgsToLinkARCLite(
     to commandLine: inout [Job.ArgTemplate],
     parsedOptions: inout ParsedOptions,
+    swiftCompiler: AbsolutePath,
     targetTriple: Triple
   ) throws {
     guard parsedOptions.hasFlag(
@@ -151,7 +161,8 @@ extension DarwinToolchain {
       return
     }
 
-    guard let arcLiteLibPath = try findARCLiteLibPath(),
+    guard let arcLiteLibPath = try findARCLiteLibPath(
+        swiftCompiler: swiftCompiler),
       let platformName = targetTriple.platformName() else {
         return
     }
@@ -176,7 +187,8 @@ extension DarwinToolchain {
     outputFile: VirtualPath,
     sdkPath: String?,
     sanitizers: Set<Sanitizer>,
-    targetTriple: Triple
+    targetTriple: Triple,
+    swiftCompiler: AbsolutePath
   ) throws -> AbsolutePath {
 
     // FIXME: If we used Clang as a linker instead of going straight to ld,
@@ -192,7 +204,8 @@ extension DarwinToolchain {
         targetTriple.darwinPlatform!.with(.device)!.libraryNameSuffix
     let compilerRTPath =
       try clangLibraryPath(
-        for: targetTriple, parsedOptions: &parsedOptions)
+        for: targetTriple, swiftCompiler: swiftCompiler,
+        parsedOptions: &parsedOptions)
       .appending(component: "libclang_rt.\(darwinPlatformSuffix).a")
     if localFileSystem.exists(compilerRTPath) {
       commandLine.append(.path(.absolute(compilerRTPath)))
@@ -224,6 +237,7 @@ extension DarwinToolchain {
           to: &commandLine,
           parsedOptions: &parsedOptions,
           targetTriple: targetTriple,
+          swiftCompiler: swiftCompiler,
           sanitizer: sanitizer,
           isShared: sanitizer != .fuzzer
         )
@@ -236,7 +250,8 @@ extension DarwinToolchain {
         to: &commandLine,
         parsedOptions: &parsedOptions,
         sdkPath: sdkPath,
-        targetTriple: targetTriple
+        targetTriple: targetTriple,
+        swiftCompiler: swiftCompiler
       )
 
       // These custom arguments should be right before the object file at the
@@ -255,6 +270,7 @@ extension DarwinToolchain {
     try addArgsToLinkARCLite(
       to: &commandLine,
       parsedOptions: &parsedOptions,
+      swiftCompiler: swiftCompiler,
       targetTriple: targetTriple
     )
     addDeploymentTargetArgs(
@@ -264,7 +280,8 @@ extension DarwinToolchain {
     try addProfileGenerationArgs(
       to: &commandLine,
       parsedOptions: &parsedOptions,
-      targetTriple: targetTriple
+      targetTriple: targetTriple,
+      swiftCompiler: swiftCompiler
     )
 
     commandLine.appendFlags(

Sources/SwiftDriver/Jobs/EmitModuleJob.swift

@@ -70,7 +70,7 @@ extension Driver {
 
     return Job(
       kind: .emitModule,
-      tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
+      tool: .absolute(swiftCompiler),
       commandLine: commandLine,
       inputs: inputs,
       outputs: outputs

Sources/SwiftDriver/Jobs/GeneratePCHJob.swift

@@ -58,7 +58,7 @@ extension Driver {
 
     return Job(
       kind: .generatePCH,
-      tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
+      tool: .absolute(swiftCompiler),
       commandLine: commandLine,
       displayInputs: [],
       inputs: inputs,

Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

@@ -50,7 +50,8 @@ extension GenericUnixToolchain {
     outputFile: VirtualPath,
     sdkPath: String?,
     sanitizers: Set<Sanitizer>,
-    targetTriple: Triple
+    targetTriple: Triple,
+    swiftCompiler: AbsolutePath
   ) throws -> AbsolutePath {
     switch linkerOutputType {
     case .dynamicLibrary:
@@ -129,7 +130,7 @@ extension GenericUnixToolchain {
       let runtimePaths = try runtimeLibraryPaths(
         for: targetTriple,
         parsedOptions: &parsedOptions,
-        sdkPath: sdkPath,
+        sdkPath: sdkPath, swiftCompiler: swiftCompiler,
         isShared: hasRuntimeArgs
       )
 
@@ -147,6 +148,7 @@ extension GenericUnixToolchain {
       let sharedResourceDirPath = try computeResourceDirPath(
         for: targetTriple,
         parsedOptions: &parsedOptions,
+        swiftCompiler: swiftCompiler,
         isShared: true
       )
 
@@ -192,6 +194,7 @@ extension GenericUnixToolchain {
       var linkFilePath: AbsolutePath? = try computeResourceDirPath(
         for: targetTriple,
         parsedOptions: &parsedOptions,
+        swiftCompiler: swiftCompiler,
         isShared: false
       )
 

Sources/SwiftDriver/Jobs/InterpretJob.swift

@@ -38,11 +38,11 @@ extension Driver {
 
     let extraEnvironment = try toolchain.platformSpecificInterpreterEnvironmentVariables(
       env: self.env, parsedOptions: &parsedOptions, sdkPath: self.sdkPath,
-      targetTriple: self.targetTriple)
+      targetTriple: self.targetTriple, swiftCompiler: self.swiftCompiler)
 
     return Job(
       kind: .interpret,
-      tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
+      tool: .absolute(swiftCompiler),
       commandLine: commandLine,
       inputs:inputs,
       outputs: [],

Sources/SwiftDriver/Jobs/LinkJob.swift

@@ -48,7 +48,8 @@ extension Driver {
       outputFile: outputFile,
       sdkPath: sdkPath,
       sanitizers: enabledSanitizers,
-      targetTriple: targetTriple
+      targetTriple: targetTriple,
+      swiftCompiler: swiftCompiler
     )
 
     return Job(

Sources/SwiftDriver/Jobs/MergeModuleJob.swift

@@ -51,7 +51,7 @@ extension Driver {
 
     return Job(
       kind: .mergeModule,
-      tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
+      tool: .absolute(swiftCompiler),
       commandLine: commandLine,
       inputs: inputs,
       outputs: outputs

Sources/SwiftDriver/Jobs/ReplJob.swift

@@ -41,7 +41,7 @@ extension Driver {
       commandLine.appendFlags("-module-name", moduleName)
       return Job(
         kind: .repl,
-        tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
+        tool: .absolute(swiftCompiler),
         commandLine: commandLine,
         inputs: [],
         outputs: [],

Sources/SwiftDriver/Jobs/Toolchain+InterpreterSupport.swift

@@ -10,6 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
+import TSCBasic
 
 extension Toolchain {
   func addPathEnvironmentVariableIfNeeded(
@@ -33,13 +34,14 @@ extension DarwinToolchain {
     env: [String : String],
     parsedOptions: inout ParsedOptions,
     sdkPath: String?,
-    targetTriple: Triple) throws -> [String: String] {
+    targetTriple: Triple,
+    swiftCompiler: AbsolutePath) throws -> [String: String] {
     var envVars: [String: String] = [:]
 
     let runtimePaths = try runtimeLibraryPaths(
       for: targetTriple,
       parsedOptions: &parsedOptions,
-      sdkPath: sdkPath,
+      sdkPath: sdkPath, swiftCompiler: swiftCompiler,
       isShared: true
     ).map { $0.pathString }
 
@@ -61,13 +63,15 @@ extension GenericUnixToolchain {
     env: [String : String],
     parsedOptions: inout ParsedOptions,
     sdkPath: String?,
-    targetTriple: Triple) throws -> [String: String] {
+    targetTriple: Triple,
+    swiftCompiler: AbsolutePath) throws -> [String: String] {
     var envVars: [String: String] = [:]
 
     let runtimePaths = try runtimeLibraryPaths(
       for: targetTriple,
       parsedOptions: &parsedOptions,
       sdkPath: sdkPath,
+      swiftCompiler: swiftCompiler,
       isShared: true
     ).map { $0.pathString }