Skip to content

Revert "Query compiler supported features from libSwiftScan, when one is present" #948

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 21, 2021
Merged

Revert "Query compiler supported features from libSwiftScan, when one is present" #948

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
24 changes: 12 additions & 12 deletions Sources/SwiftDriver/Jobs/EmitSupportedFeaturesJob.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@ extension Driver {
fileSystem: FileSystem,
executor: DriverExecutor, env: [String: String])
throws -> Set<String> {
// if libSwiftScan is present in the toolchain, query the compiler supported features
// using the SwiftScan interface, instead of calling out to swift-frontend.
let swiftScanLibPath = try Self.getScanLibPath(of: toolchain,
hostTriple: hostTriple,
env: env)

if fileSystem.exists(swiftScanLibPath) {
let libSwiftScanInstance = try SwiftScan(dylib: swiftScanLibPath)
if libSwiftScanInstance.canQuerySupportedArguments() {
return try libSwiftScanInstance.querySupportedArguments()
}
}
// TODO: Once we are sure libSwiftScan is deployed across supported platforms and architectures
// we should deploy it here.
// let swiftScanLibPath = try Self.getScanLibPath(of: toolchain,
// hostTriple: hostTriple,
// env: env)
//
// if fileSystem.exists(swiftScanLibPath) {
// let libSwiftScanInstance = try SwiftScan(dylib: swiftScanLibPath)
// if libSwiftScanInstance.canQuerySupportedArguments() {
// return try libSwiftScanInstance.querySupportedArguments()
// }
// }

// Invoke `swift-frontend -emit-supported-features`
let frontendOverride = try FrontendOverride(&parsedOptions, diagnosticsEngine)
Expand Down