Check OutputFileMap

Author: cltnschlosser

Sources/SwiftDriver/Driver/Driver.swift

@@ -292,7 +292,9 @@ public struct Driver {
     self.sdkPath = Self.computeSDKPath(&parsedOptions, compilerMode: compilerMode, toolchain: toolchain, diagnosticsEngine: diagnosticEngine, env: env)
 
     self.importedObjCHeader = try Self.computeImportedObjCHeader(&parsedOptions, compilerMode: compilerMode, diagnosticEngine: diagnosticEngine)
-    self.bridgingPrecompiledHeader = try Self.computeBridgingPrecompiledHeader(&parsedOptions, importedObjCHeader: importedObjCHeader)
+    self.bridgingPrecompiledHeader = try Self.computeBridgingPrecompiledHeader(&parsedOptions,
+                                                                               importedObjCHeader: importedObjCHeader,
+                                                                               outputFileMap: outputFileMap)
 
     self.enabledSanitizers = try Self.parseSanitizerArgValues(&parsedOptions, diagnosticEngine: diagnosticEngine, toolchain: toolchain, targetTriple: targetTriple)
 
@@ -1340,12 +1342,17 @@ extension Driver {
   }
 
   /// Compute the path of the generated bridging PCH for the Objective-C header.
-  static func computeBridgingPrecompiledHeader(_ parsedOptions: inout ParsedOptions, importedObjCHeader: VirtualPath?) throws -> VirtualPath? {
+  static func computeBridgingPrecompiledHeader(_ parsedOptions: inout ParsedOptions,
+                                               importedObjCHeader: VirtualPath?,
+                                               outputFileMap: OutputFileMap?) throws -> VirtualPath? {
     guard let input = importedObjCHeader,
       parsedOptions.hasFlag(positive: .enableBridgingPch, negative: .disableBridgingPch, default: true) else {
         return nil
     }
-    // FIXME: Check OutputFileMap?
+
+    if let outputPath = outputFileMap?.existingOutput(inputFile: input, outputType: .pch) {
+      return outputPath
+    }
 
     // FIXME: should have '-.*' at the end of the filename, similar to llvm::sys::fs::createTemporaryFile
     let pchFileName = input.basenameWithoutExt.appendingFileTypeExtension(.pch)

Sources/SwiftDriver/Jobs/GeneratePCHJob.swift

@@ -29,13 +29,14 @@ extension Driver {
     try addCommonFrontendOptions(commandLine: &commandLine, requestPrecompiledObjCHeader: false)
 
     try commandLine.appendLast(.indexStorePath, from: &parsedOptions)
-    
-    // TODO: Move this to Driver and check OutputFileMap
+
     // TODO: Should this just be pch output with extension changed?
     if parsedOptions.hasArgument(.serializeDiagnostics), let outputDirectory = parsedOptions.getLastArgument(.pchOutputDir)?.asSingle {
       commandLine.appendFlag(.serializeDiagnosticsPath)
       let path: VirtualPath
-      if let modulePath = parsedOptions.getLastArgument(.emitModulePath) {
+      if let outputPath = outputFileMap?.existingOutput(inputFile: input.file, outputType: .diagnostics) {
+        path = outputPath
+      } else if let modulePath = parsedOptions.getLastArgument(.emitModulePath) {
         // TODO: does this hash need to be persistent?
         let code = UInt(bitPattern: modulePath.asSingle.hashValue)
         let outputName = input.file.basenameWithoutExt + "-" + String(code, radix: 36)