Merge pull request #1993 from DougGregor/internal-import-bridging-header

Author: DougGregor

Sources/SwiftDriver/Driver/Driver.swift

@@ -353,6 +353,9 @@ public struct Driver {
   /// Original ObjC Header passed from command-line
   let originalObjCHeaderFile: VirtualPath.Handle?
 
+  /// Whether to import the bridging header as internal (vs public).
+  let importBridgingHeaderAsInternal: Bool
+
   /// Enable bridging header chaining.
   let bridgingHeaderChaining: Bool
 
@@ -1165,10 +1168,12 @@ public struct Driver {
     }
     self.producePCHJob = maybeNeedPCH
 
-    if let objcHeaderPathArg = parsedOptions.getLastArgument(.importObjcHeader) {
-      self.originalObjCHeaderFile = try? VirtualPath.intern(path: objcHeaderPathArg.asSingle)
+    if let importBridgingHeaderOption = parsedOptions.last(for: .importBridgingHeader, .internalImportBridgingHeader) {
+      self.originalObjCHeaderFile = try? VirtualPath.intern(path: importBridgingHeaderOption.argument.asSingle)
+      self.importBridgingHeaderAsInternal = importBridgingHeaderOption.option == .internalImportBridgingHeader
     } else {
       self.originalObjCHeaderFile = nil
+      self.importBridgingHeaderAsInternal = false
     }
 
     if parsedOptions.hasFlag(positive: .autoBridgingHeaderChaining,
@@ -2059,8 +2064,8 @@ extension Driver {
 
     // Put bridging header as first input if we have it
     let allInputs: [TypedVirtualPath]
-    if let objcHeader = originalObjCHeaderFile {
-      allInputs = [TypedVirtualPath(file: objcHeader, type: .objcHeader)] + inputFiles
+    if let bridgingHeader = originalObjCHeaderFile {
+      allInputs = [TypedVirtualPath(file: bridgingHeader, type: .objcHeader)] + inputFiles
     } else {
       allInputs = inputFiles
     }

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -229,7 +229,6 @@ extension Driver {
     try commandLine.appendLast(.nostdimport, from: &parsedOptions)
     try commandLine.appendLast(.nostdlibimport, from: &parsedOptions)
     try commandLine.appendLast(.parseStdlib, from: &parsedOptions)
-    try commandLine.appendLast(.solverMemoryThreshold, from: &parsedOptions)
     try commandLine.appendLast(.valueRecursionThreshold, from: &parsedOptions)
     try commandLine.appendLast(.warnSwift3ObjcInference, from: &parsedOptions)
     try commandLine.appendLast(.remarkLoadingModule, from: &parsedOptions)
@@ -475,14 +474,17 @@ extension Driver {
               try computeCanonicalObjCHeader(explicitModulePlanner: explicitModulePlanner)
     let objcHeaderFile = (kind == .scanDependencies) ? originalObjCHeaderFile : importedObjCHeader
     if let importedObjCHeader = objcHeaderFile, bridgingHeaderHandling != .ignored {
+      let importBridgingHeaderFlag: Option = importBridgingHeaderAsInternal
+        ? .internalImportBridgingHeader
+        : .importObjcHeader
       if bridgingHeaderHandling == .precompiled, let pch = precompiledObjCHeader {
         // For explicit module build, we directly pass the compiled pch to
         // swift-frontend, rather than rely on swift-frontend to locate
         // the pch in the pchOutputDir and can start an implicit build in case
         // of a lookup failure.
         if parsedOptions.contains(.pchOutputDir) &&
            !parsedOptions.contains(.driverExplicitModuleBuild) {
-          commandLine.appendFlag(.importObjcHeader)
+          commandLine.appendFlag(importBridgingHeaderFlag)
           try addPathArgument(VirtualPath.lookup(importedObjCHeader), to:&commandLine, remap: jobNeedPathRemap)
           try commandLine.appendLast(.pchOutputDir, from: &parsedOptions)
           if !compilerMode.isSingleCompilation {
@@ -491,21 +493,21 @@ extension Driver {
         } else {
           // If header chaining is enabled, pass objc header through `-import-objc-header` and
           // PCH file through `-import-pch`. Otherwise, pass either the PCH or header through
-          // `-import-objc-header` option.
+          // `-import-objc-header` option (or its internal variant).
           if isFrontendArgSupported(.importPch), importedObjCHeader != originalObjCHeaderFile {
-            commandLine.appendFlag(.importPch)
+            commandLine.appendFlag(importBridgingHeaderAsInternal ? .internalImportPch : .importPch)
             try addPathArgument(VirtualPath.lookup(pch), to:&commandLine, remap: jobNeedPathRemap)
             if let originalHeader = originalObjCHeaderFile {
-              commandLine.appendFlag(.importObjcHeader)
+              commandLine.appendFlag(importBridgingHeaderFlag)
               try addPathArgument(VirtualPath.lookup(originalHeader), to:&commandLine, remap: jobNeedPathRemap)
             }
           } else {
-            commandLine.appendFlag(.importObjcHeader)
+            commandLine.appendFlag(importBridgingHeaderFlag)
             try addPathArgument(VirtualPath.lookup(pch), to:&commandLine, remap: jobNeedPathRemap)
           }
         }
       } else {
-        commandLine.appendFlag(.importObjcHeader)
+        commandLine.appendFlag(importBridgingHeaderFlag)
         try addPathArgument(VirtualPath.lookup(importedObjCHeader), to:&commandLine, remap: jobNeedPathRemap)
       }
     }

Sources/SwiftDriver/Jobs/ReplJob.swift

@@ -18,7 +18,10 @@ extension Driver {
     try addCommonFrontendOptions(commandLine: &commandLine, inputs: &inputs, kind: .repl)
     try addRuntimeLibraryFlags(commandLine: &commandLine)
 
-    try commandLine.appendLast(.importObjcHeader, from: &parsedOptions)
+    try commandLine.appendLast(
+      .importObjcHeader, .internalImportBridgingHeader,
+      from: &parsedOptions
+    )
     toolchain.addLinkedLibArgs(
       to: &commandLine,
       parsedOptions: &parsedOptions