Merge pull request #1303 from artemcm/FallBackHatchForInProcessTargetInfo

Attempt to recover from in-process Target Info and Supported Features query failures.

Author: artemcm

Sources/SwiftDriver/Driver/Driver.swift

@@ -2936,6 +2936,7 @@ extension Driver {
                                       swiftCompilerPrefixArgs: frontendOverride.prefixArgsForTargetInfo,
                                       toolchain: toolchain, fileSystem: fileSystem,
                                       workingDirectory: workingDirectory,
+                                      diagnosticsEngine: diagnosticsEngine,
                                       executor: executor).target.triple
   }
 
@@ -3000,6 +3001,7 @@ extension Driver {
                                    swiftCompilerPrefixArgs: frontendOverride.prefixArgsForTargetInfo,
                                    toolchain: toolchain, fileSystem: fileSystem,
                                    workingDirectory: workingDirectory,
+                                   diagnosticsEngine: diagnosticsEngine,
                                    executor: executor)
 
       // Parse the runtime compatibility version. If present, it will override

Sources/SwiftDriver/Jobs/EmitSupportedFeaturesJob.swift

@@ -64,9 +64,13 @@ extension Driver {
                                            fileSystem: FileSystem,
                                            executor: DriverExecutor)
   throws -> Set<String> {
-    if let supportedArgs =
-        try querySupportedCompilerArgsInProcess(of: toolchain, fileSystem: fileSystem) {
-      return supportedArgs
+    do {
+      if let supportedArgs =
+          try querySupportedCompilerArgsInProcess(of: toolchain, fileSystem: fileSystem) {
+        return supportedArgs
+      }
+    } catch {
+      diagnosticsEngine.emit(.warning_inprocess_supported_features_query_failed(error.localizedDescription))
     }
 
     // Fallback: Invoke `swift-frontend -emit-supported-features` and decode the output

Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift

@@ -13,6 +13,7 @@
 import protocol TSCBasic.FileSystem
 import class Foundation.JSONDecoder
 import struct TSCBasic.AbsolutePath
+import class TSCBasic.DiagnosticsEngine
 
 /// Swift versions are major.minor.
 struct SwiftVersion {
@@ -232,6 +233,7 @@ extension Driver {
                                 toolchain: Toolchain,
                                 fileSystem: FileSystem,
                                 workingDirectory: AbsolutePath?,
+                                diagnosticsEngine: DiagnosticsEngine,
                                 executor: DriverExecutor) throws -> FrontendTargetInfo {
     let frontendTargetInfoJob =
       try toolchain.printTargetInfoJob(target: target, targetVariant: targetVariant,
@@ -244,11 +246,16 @@ extension Driver {
                                               useResponseFiles: .disabled,
                                               using: executor.resolver)
     Self.sanitizeCommandForLibScanInvocation(&command)
-    if let targetInfo =
-        try Self.queryTargetInfoInProcess(of: toolchain, fileSystem: fileSystem,
-                                          workingDirectory: workingDirectory,
-                                          invocationCommand: command) {
-      return targetInfo
+
+    do {
+      if let targetInfo =
+          try Self.queryTargetInfoInProcess(of: toolchain, fileSystem: fileSystem,
+                                            workingDirectory: workingDirectory,
+                                            invocationCommand: command) {
+        return targetInfo
+      }
+    } catch {
+      diagnosticsEngine.emit(.warning_inprocess_target_info_query_failed(error.localizedDescription))
     }
 
     // Fallback: Invoke `swift-frontend -print-target-info` and decode the output

Sources/SwiftDriver/Utilities/Diagnostics.swift

@@ -51,6 +51,14 @@ extension Diagnostic.Message {
     .warning("inferring simulator environment for target '\(originalTriple.triple)'; use '-target \(inferredTriple.triple)' instead")
   }
 
+  static func warning_inprocess_target_info_query_failed(_ error: String) -> Diagnostic.Message {
+    .warning("In-process target-info query failed (\(error)). Using fallback mechanism.")
+  }
+
+  static func warning_inprocess_supported_features_query_failed(_ error: String) -> Diagnostic.Message {
+    .warning("In-process supported-compiler-features query failed (\(error)). Using fallback mechanism.")
+  }
+
   static func error_argument_not_allowed_with(arg: String, other: String) -> Diagnostic.Message {
     .error("argument '\(arg)' is not allowed with '\(other)'")
   }