Move importedObjCHeader code back into addCommonFrontendOptions

Author: cltnschlosser

Sources/SwiftDriver/Jobs/CompileJob.swift

@@ -103,22 +103,6 @@ extension Driver {
     try addCommonFrontendOptions(commandLine: &commandLine)
     // FIXME: MSVC runtime flags
 
-    if let importedObjCHeader = importedObjCHeader {
-      commandLine.appendFlag(.importObjcHeader)
-      if let pch = bridgingPrecompiledHeader {
-        if parsedOptions.contains(.pchOutputDir) {
-          commandLine.appendPath(importedObjCHeader)
-          if compilerMode != .singleCompile {
-            commandLine.appendFlag(.pchDisableValidation)
-          }
-        } else {
-          commandLine.appendPath(pch)
-        }
-      } else {
-        commandLine.appendPath(importedObjCHeader)
-      }
-    }
-
     if parsedOptions.hasArgument(.parseAsLibrary, .emitLibrary) {
       commandLine.appendFlag(.parseAsLibrary)
     }

Sources/SwiftDriver/Jobs/EmitModuleJob.swift

@@ -62,11 +62,6 @@ extension Driver {
 
     try addCommonFrontendOptions(commandLine: &commandLine)
     // FIXME: Add MSVC runtime library flags
-    
-    if let importedObjCHeader = importedObjCHeader {
-      commandLine.appendFlag(.importObjcHeader)
-      commandLine.appendPath(importedObjCHeader)
-    }
 
     try addCommonModuleOptions(commandLine: &commandLine, outputs: &outputs)
 

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -22,7 +22,8 @@ fileprivate func shouldColorDiagnostics() -> Bool {
 
 extension Driver {
   /// Add frontend options that are common to different frontend invocations.
-  mutating func addCommonFrontendOptions(commandLine: inout [Job.ArgTemplate]) throws {
+  mutating func addCommonFrontendOptions(commandLine: inout [Job.ArgTemplate],
+                                         requestPrecompiledObjCHeader: Bool = true) throws {
     // Only pass -target to the REPL or immediate modes if it was explicitly
     // specified on the command line.
     switch compilerMode {
@@ -154,6 +155,22 @@ extension Driver {
     // Pass through any subsystem flags.
     try commandLine.appendAll(.Xllvm, from: &parsedOptions)
     try commandLine.appendAll(.Xcc, from: &parsedOptions)
+    
+    if let importedObjCHeader = importedObjCHeader {
+      commandLine.appendFlag(.importObjcHeader)
+      if requestPrecompiledObjCHeader, let pch = bridgingPrecompiledHeader {
+        if parsedOptions.contains(.pchOutputDir) {
+          commandLine.appendPath(importedObjCHeader)
+          if compilerMode != .singleCompile {
+            commandLine.appendFlag(.pchDisableValidation)
+          }
+        } else {
+          commandLine.appendPath(pch)
+        }
+      } else {
+        commandLine.appendPath(importedObjCHeader)
+      }
+    }
 
     // Repl Jobs may include -module-name depending on the selected REPL (LLDB or integrated).
     if compilerMode != .repl {

Sources/SwiftDriver/Jobs/GeneratePCHJob.swift

@@ -27,12 +27,7 @@ extension Driver {
 
     outputs.append(output)
 
-    try addCommonFrontendOptions(commandLine: &commandLine)
-
-    if let importedObjCHeader = importedObjCHeader {
-      commandLine.appendFlag(.importObjcHeader)
-      commandLine.appendPath(importedObjCHeader)
-    }
+    try addCommonFrontendOptions(commandLine: &commandLine, requestPrecompiledObjCHeader: false)
 
     try commandLine.appendLast(.indexStorePath, from: &parsedOptions)
 

Sources/SwiftDriver/Jobs/MergeModuleJob.swift

@@ -43,11 +43,6 @@ extension Driver {
 
     try addCommonFrontendOptions(commandLine: &commandLine)
     // FIXME: Add MSVC runtime library flags
-    
-    if let importedObjCHeader = importedObjCHeader {
-      commandLine.appendFlag(.importObjcHeader)
-      commandLine.appendPath(importedObjCHeader)
-    }
 
     try addCommonModuleOptions(commandLine: &commandLine, outputs: &outputs)