Skip to content

Only specify -dwarf-version if the frontend supports it #1502

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 11, 2023
Merged

Only specify -dwarf-version if the frontend supports it #1502

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 @@ -197,7 +197,9 @@ extension Driver {
try commandLine.appendLast(in: .g, from: &parsedOptions)
if debugInfo.level != nil {
commandLine.appendFlag("-debug-info-format=\(debugInfo.format)")
commandLine.appendFlag("-dwarf-version=\(debugInfo.dwarfVersion)")
if isFrontendArgSupported(.dwarfVersion) {
commandLine.appendFlag("-dwarf-version=\(debugInfo.dwarfVersion)")
}
}
try commandLine.appendLast(.importUnderlyingModule, from: &parsedOptions)
try commandLine.appendLast(.moduleCachePath, from: &parsedOptions)
Expand Down
27 changes: 17 additions & 10 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,17 +582,29 @@ final class SwiftDriverTests: XCTestCase {
$1.expect(.error("invalid value '6' in '-dwarf-version="))
}

try assertNoDriverDiagnostics(args: "swiftc", "foo.swift", "-emit-module", "-g", "-debug-info-format=dwarf", "-dwarf-version=4") { driver in
let jobs = try driver.planBuild()
XCTAssertTrue(jobs[0].commandLine.contains(.flag("-dwarf-version=4")))
}

try assertNoDriverDiagnostics(args: "swiftc", "foo.swift", "-g", "-c", "-file-compilation-dir", ".") { driver in
let jobs = try driver.planBuild()
XCTAssertTrue(jobs[0].commandLine.contains(.flag("-file-compilation-dir")))
XCTAssertTrue(jobs[0].commandLine.contains(.flag(".")))
}

try assertNoDriverDiagnostics(args: "swiftc", "foo.swift", "-c", "-file-compilation-dir", ".") { driver in
let jobs = try driver.planBuild()
XCTAssertFalse(jobs[0].commandLine.contains(.flag("-file-compilation-dir")))
}
}

func testDwarfVersionSetting() throws {
let driver = try Driver(args: ["swiftc", "foo.swift"])
guard driver.isFrontendArgSupported(.dwarfVersion) else {
throw XCTSkip("Skipping: compiler does not support '-dwarf-version'")
}

try assertNoDriverDiagnostics(args: "swiftc", "foo.swift", "-emit-module", "-g", "-debug-info-format=dwarf", "-dwarf-version=4") { driver in
let jobs = try driver.planBuild()
XCTAssertTrue(jobs[0].commandLine.contains(.flag("-dwarf-version=4")))
}

try assertNoDriverDiagnostics(args: "swiftc", "foo.swift", "-g", "-c", "-target", "x86_64-apple-macosx10.10") { driver in
let jobs = try driver.planBuild()
XCTAssertTrue(jobs[0].commandLine.contains(.flag("-dwarf-version=2")))
Expand Down Expand Up @@ -625,11 +637,6 @@ final class SwiftDriverTests: XCTestCase {
let jobs = try driver.planBuild()
XCTAssertTrue(jobs[0].commandLine.contains(.flag("-dwarf-version=4")))
}

try assertNoDriverDiagnostics(args: "swiftc", "foo.swift", "-c", "-file-compilation-dir", ".") { driver in
let jobs = try driver.planBuild()
XCTAssertFalse(jobs[0].commandLine.contains(.flag("-file-compilation-dir")))
}
}

func testCoverageSettings() throws {
Expand Down