Skip to content

Only pass down the -no-verify-emitted-module-interface flag if the frontend accepts it #1548

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
xymus merged 1 commit into from
Feb 21, 2024
Merged

Only pass down the -no-verify-emitted-module-interface flag if the frontend accepts it #1548

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
3 changes: 2 additions & 1 deletion Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,8 @@ extension Driver {
// Pass along -no-verify-emitted-module-interface only if it's effective.
// Assume verification by default as we want to know only when the user skips
// the verification.
if !parsedOptions.hasFlag(positive: .verifyEmittedModuleInterface,
if isFrontendArgSupported(.noVerifyEmittedModuleInterface) &&
!parsedOptions.hasFlag(positive: .verifyEmittedModuleInterface,
negative: .noVerifyEmittedModuleInterface,
default: true) {
commandLine.appendFlag("-no-verify-emitted-module-interface")
Expand Down
8 changes: 6 additions & 2 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5621,7 +5621,9 @@ final class SwiftDriverTests: XCTestCase {
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 2)
let emitJob = try plannedJobs.findJob(.emitModule)
XCTAssertTrue(emitJob.commandLine.contains("-no-verify-emitted-module-interface"))
if driver.isFrontendArgSupported(.noVerifyEmittedModuleInterface) {
XCTAssertTrue(emitJob.commandLine.contains("-no-verify-emitted-module-interface"))
}
}

// Disabled by default in merge-module
Expand Down Expand Up @@ -5694,7 +5696,9 @@ final class SwiftDriverTests: XCTestCase {
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 1)
let compileJob = try plannedJobs.findJob(.compile)
XCTAssertTrue(compileJob.commandLine.contains("-no-verify-emitted-module-interface"))
if driver.isFrontendArgSupported(.noVerifyEmittedModuleInterface) {
XCTAssertTrue(compileJob.commandLine.contains("-no-verify-emitted-module-interface"))
}
}

// Enabled by default when the library-level is api.
Expand Down