Skip to content

[-debug-module-path] Prefer the moduleOutputInfo.output path if avail… #2012

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −1
Open

[-debug-module-path] Prefer the moduleOutputInfo.output path if avail… #2012

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: 3 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 @@ -112,7 +112,9 @@ extension Driver {
if isPlanJobForExplicitModule && forObject && isFrontendArgSupported(.debugModulePath),
let explicitModulePlanner {
let mainModule = explicitModulePlanner.dependencyGraph.mainModule
try addPathOption(option: .debugModulePath, path: VirtualPath.lookup(mainModule.modulePath.path), to: &commandLine, remap: jobNeedPathRemap)
let pathHandle = moduleOutputInfo.output?.outputPath ?? mainModule.modulePath.path
let path = VirtualPath.lookup(pathHandle)
try addPathOption(option: .debugModulePath, path: path, to: &commandLine, remap: jobNeedPathRemap)
}

// Check if dependency scanner has put the job into direct clang cc1 mode.
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 @@ -1075,6 +1075,10 @@ final class ExplicitModuleBuildTests: XCTestCase {
let baseName = "testExplicitModuleVerifyInterfaceJobs"
XCTAssertTrue(matchTemporary(outputFilePath, basename: baseName, fileExtension: "o") ||
matchTemporary(outputFilePath, basename: baseName, fileExtension: "autolink"))
if outputFilePath.extension == FileType.object.rawValue && driver.isFrontendArgSupported(.debugModulePath) {
// Check that this is an absolute path pointing to the temporary directory.
XCTAssertTrue(job.commandLine.contains(subsequence: ["-debug-module-path", .path(.temporary(try RelativePath(validating: "testExplicitModuleVerifyInterfaceJobs-3.swiftmodule")))]))
}
default:
XCTFail("Unexpected module dependency build job output: \(outputFilePath)")
}
Expand Down
Loading