Switch over to using V2 of the swiftscan_compiler_target_info_query API

This new version takes the path to the compiler executable as a parameter, in order for libSwiftScan to compute compiler-relative portions of runtimeLibraryPaths, runtimeResourcePath, etc.

Author: artemcm

Sources/CSwiftScan/include/swiftscan_header.h

@@ -211,7 +211,8 @@ typedef struct {
 
   //=== Target Info Functions-------- ---------------------------------------===//
   swiftscan_string_ref_t
-  (*swiftscan_compiler_target_info_query)(swiftscan_scan_invocation_t);
+  (*swiftscan_compiler_target_info_query_v2)(swiftscan_scan_invocation_t,
+                                             const char *);
 
   //=== Functionality Query Functions ---------------------------------------===//
   swiftscan_string_set_t *

Sources/SwiftDriver/Driver/Driver.swift

@@ -2906,18 +2906,11 @@ extension Driver {
     let frontendOverride = try FrontendOverride(&parsedOptions, diagnosticsEngine)
     frontendOverride.setUpForTargetInfo(toolchain)
     defer { frontendOverride.setUpForCompilation(toolchain) }
-    return try executor.execute(
-      job: toolchain.printTargetInfoJob(target: nil, targetVariant: nil,
-                                        swiftCompilerPrefixArgs:
-                                          frontendOverride.prefixArgsForTargetInfo),
-      capturingJSONOutputAs: FrontendTargetInfo.self,
-      forceResponseFiles: false,
-      recordedInputModificationDates: [:]).target.triple
-//    return try Self.computeTargetInfo(target: nil, targetVariant: nil,
-//                                      swiftCompilerPrefixArgs: frontendOverride.prefixArgsForTargetInfo,
-//                                      toolchain: toolchain, fileSystem: fileSystem,
-//                                      workingDirectory: workingDirectory,
-//                                      executor: executor).target.triple
+    return try Self.computeTargetInfo(target: nil, targetVariant: nil,
+                                      swiftCompilerPrefixArgs: frontendOverride.prefixArgsForTargetInfo,
+                                      toolchain: toolchain, fileSystem: fileSystem,
+                                      workingDirectory: workingDirectory,
+                                      executor: executor).target.triple
   }
 
   static func computeToolchain(
@@ -2972,28 +2965,16 @@ extension Driver {
 
     // Query the frontend for target information.
     do {
-      var info: FrontendTargetInfo = try executor.execute(
-        job: toolchain.printTargetInfoJob(
-          target: explicitTarget, targetVariant: explicitTargetVariant,
-          sdkPath: sdkPath, resourceDirPath: resourceDirPath,
-          runtimeCompatibilityVersion:
-            parsedOptions.getLastArgument(.runtimeCompatibilityVersion)?.asSingle,
-          useStaticResourceDir: useStaticResourceDir,
-          swiftCompilerPrefixArgs: frontendOverride.prefixArgsForTargetInfo
-        ),
-        capturingJSONOutputAs: FrontendTargetInfo.self,
-        forceResponseFiles: false,
-        recordedInputModificationDates: [:])
-//      var info: FrontendTargetInfo =
-//        try Self.computeTargetInfo(target: explicitTarget, targetVariant: explicitTargetVariant,
-//                                   sdkPath: sdkPath, resourceDirPath: resourceDirPath,
-//                                   runtimeCompatibilityVersion:
-//                                     parsedOptions.getLastArgument(.runtimeCompatibilityVersion)?.asSingle,
-//                                   useStaticResourceDir: useStaticResourceDir,
-//                                   swiftCompilerPrefixArgs: frontendOverride.prefixArgsForTargetInfo,
-//                                   toolchain: toolchain, fileSystem: fileSystem,
-//                                   workingDirectory: workingDirectory,
-//                                   executor: executor)
+      var info: FrontendTargetInfo =
+        try Self.computeTargetInfo(target: explicitTarget, targetVariant: explicitTargetVariant,
+                                   sdkPath: sdkPath, resourceDirPath: resourceDirPath,
+                                   runtimeCompatibilityVersion:
+                                     parsedOptions.getLastArgument(.runtimeCompatibilityVersion)?.asSingle,
+                                   useStaticResourceDir: useStaticResourceDir,
+                                   swiftCompilerPrefixArgs: frontendOverride.prefixArgsForTargetInfo,
+                                   toolchain: toolchain, fileSystem: fileSystem,
+                                   workingDirectory: workingDirectory,
+                                   executor: executor)
 
       // Parse the runtime compatibility version. If present, it will override
       // what is reported by the frontend.

Sources/SwiftDriver/Execution/DriverExecutor.swift

@@ -87,7 +87,6 @@ extension DriverExecutor {
                              capturingJSONOutputAs outputType: T.Type,
                              forceResponseFiles: Bool,
                              recordedInputModificationDates: [TypedVirtualPath: TimePoint]) throws -> T {
-    //print(">>> EXEC: \(try self.description(of: job, forceResponseFiles: false))")
     let result = try execute(job: job,
                              forceResponseFiles: forceResponseFiles,
                              recordedInputModificationDates: recordedInputModificationDates)

Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift

@@ -188,9 +188,11 @@ extension Driver {
        fileSystem.exists(swiftScanLibPath) {
       let libSwiftScanInstance = try SwiftScan(dylib: swiftScanLibPath)
       if libSwiftScanInstance.canQueryTargetInfo() {
-        let cwd = workingDirectory ?? fileSystem.currentWorkingDirectory!
+        let cwd = try workingDirectory ?? fileSystem.currentWorkingDirectory ?? fileSystem.tempDirectory
+        let compilerExecutablePath = try toolchain.resolvedTool(.swiftCompiler).path
         let targetInfoData =
           try libSwiftScanInstance.queryTargetInfoJSON(workingDirectory: cwd,
+                                                       compilerExecutablePath: compilerExecutablePath,
                                                        invocationCommand: invocationCommand)
         do {
           return try JSONDecoder().decode(FrontendTargetInfo.self, from: targetInfoData)

Sources/SwiftDriver/SwiftScan/SwiftScan.swift

@@ -319,11 +319,12 @@ internal extension swiftscan_diagnostic_severity_t {
   }
 
   @_spi(Testing) public func canQueryTargetInfo() -> Bool {
-    return api.swiftscan_compiler_target_info_query != nil &&
+    return api.swiftscan_compiler_target_info_query_v2 != nil &&
            api.swiftscan_string_set_dispose != nil
   }
 
   func queryTargetInfoJSON(workingDirectory: AbsolutePath,
+                           compilerExecutablePath: AbsolutePath,
                            invocationCommand: [String]) throws -> Data {
     // Create and configure the scanner invocation
     let invocation = api.swiftscan_scan_invocation_create()
@@ -337,11 +338,13 @@ internal extension swiftscan_diagnostic_severity_t {
                                              Int32(invocationCommand.count),
                                              invocationStringArray)
     }
-    let targetInfoStringRef = api.swiftscan_compiler_target_info_query(invocation)
-    let targetInfoString = try toSwiftString(targetInfoStringRef)
-    if supportsStringDispose() {
-      api.swiftscan_string_dispose(targetInfoStringRef)
+
+    let targetInfoString: String = try compilerExecutablePath.description.withCString { cstring in
+      let targetInfoStringRef = api.swiftscan_compiler_target_info_query_v2(invocation, cstring)
+      defer { api.swiftscan_string_dispose(targetInfoStringRef) }
+      return try toSwiftString(targetInfoStringRef)
     }
+
     let targetInfoData = Data(targetInfoString.utf8)
     return targetInfoData
   }
@@ -382,8 +385,8 @@ private extension swiftscan_functions_t {
       try loadOptional("swiftscan_compiler_supported_features_query")
 
     // Target Info query
-    self.swiftscan_compiler_target_info_query =
-      try loadOptional("swiftscan_compiler_target_info_query")
+    self.swiftscan_compiler_target_info_query_v2 =
+      try loadOptional("swiftscan_compiler_target_info_query_v2")
 
     // Dependency scanner serialization/deserialization features
     self.swiftscan_scanner_cache_serialize =