Skip to content

[Dependency Scanning] Enable scanner-side up-to-date binary module validation on supporting compilers #1677

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
Aug 1, 2024
Merged

[Dependency Scanning] Enable scanner-side up-to-date binary module validation on supporting compilers #1677

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
4 changes: 4 additions & 0 deletions Sources/SwiftDriver/ExplicitModuleBuilds/ModuleDependencyScanning.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ public extension Driver {
try commandLine.appendLast(.clangScannerModuleCachePath, from: &parsedOptions)
}

if isFrontendArgSupported(.scannerModuleValidation) {
commandLine.appendFlag(.scannerModuleValidation)
}

if isFrontendArgSupported(.scannerPrefixMap) {
// construct `-scanner-prefix-mapper` for scanner.
for (key, value) in prefixMapping {
Expand Down
4 changes: 4 additions & 0 deletions Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,6 +1710,10 @@ final class ExplicitModuleBuildTests: XCTestCase {
scannerCommand.removeFirst()
}

if driver.isFrontendArgSupported(.scannerModuleValidation) {
XCTAssertTrue(scannerCommand.contains("-scanner-module-validation"))
}

// Ensure we do not propagate the usual PCH-handling arguments to the scanner invocation
XCTAssertFalse(scannerCommand.contains("-pch-output-dir"))
XCTAssertFalse(scannerCommand.contains("Foo.o"))
Expand Down