Skip to content

[6.0] Disable in-process target-info and supported-features queries using libSwiftScan #1745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2024
Merged

[6.0] Disable in-process target-info and supported-features queries using libSwiftScan #1745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions Sources/SwiftDriver/Jobs/EmitSupportedFeaturesJob.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,16 @@ extension Driver {
fileSystem: FileSystem,
executor: DriverExecutor)
throws -> Set<String> {
do {
if let supportedArgs =
try querySupportedCompilerArgsInProcess(of: toolchain, fileSystem: fileSystem) {
return supportedArgs
}
} catch {
diagnosticsEngine.emit(.remark_inprocess_supported_features_query_failed(error.localizedDescription))
}
// Disable in-process supported features query due to a race condition in the compiler's current
// build system where libSwiftScan may not be ready when building the Swift standard library.
// do {
// if let supportedArgs =
// try querySupportedCompilerArgsInProcess(of: toolchain, fileSystem: fileSystem) {
// return supportedArgs
// }
// } catch {
// diagnosticsEngine.emit(.remark_inprocess_supported_features_query_failed(error.localizedDescription))
// }

// Fallback: Invoke `swift-frontend -emit-supported-features` and decode the output
let frontendOverride = try FrontendOverride(&parsedOptions, diagnosticsEngine)
Expand Down
22 changes: 12 additions & 10 deletions Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,16 +248,18 @@ extension Driver {
using: executor.resolver)
Self.sanitizeCommandForLibScanInvocation(&command)

do {
if let targetInfo =
try Self.queryTargetInfoInProcess(of: toolchain, fileSystem: fileSystem,
workingDirectory: workingDirectory,
invocationCommand: command) {
return targetInfo
}
} catch {
diagnosticsEngine.emit(.remark_inprocess_target_info_query_failed(error.localizedDescription))
}
// Disable in-process target query due to a race condition in the compiler's current
// build system where libSwiftScan may not be ready when building the Swift standard library.
// do {
// if let targetInfo =
// try Self.queryTargetInfoInProcess(of: toolchain, fileSystem: fileSystem,
// workingDirectory: workingDirectory,
// invocationCommand: command) {
// return targetInfo
// }
// } catch {
// diagnosticsEngine.emit(.remark_inprocess_target_info_query_failed(error.localizedDescription))
// }

// Fallback: Invoke `swift-frontend -print-target-info` and decode the output
return try executor.execute(
Expand Down