Skip to content

Add abi descriptor to the output file list #851

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
Sep 27, 2021
Merged

Add abi descriptor to the output file list #851

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/EmitModuleJob.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ extension Driver {
commandLine.appendPath(outputPath)
if isFeatureSupported(.emit_abi_descriptor) {
commandLine.appendFlag(.emitAbiDescriptorPath)
commandLine.appendPath(outputPath.replacingExtension(with: .jsonABIBaseline))
let abiOutput = outputPath.replacingExtension(with: .jsonABIBaseline)
commandLine.appendPath(abiOutput)
outputs.append(TypedVirtualPath(file: abiOutput.intern(), type: .jsonABIBaseline))
}
return Job(
moduleName: moduleOutputInfo.name,
Expand Down
4 changes: 3 additions & 1 deletion Sources/SwiftDriver/Jobs/MergeModuleJob.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ extension Driver {

if isFeatureSupported(.emit_abi_descriptor) {
commandLine.appendFlag(.emitAbiDescriptorPath)
commandLine.appendPath(outputPath.replacingExtension(with: .jsonABIBaseline))
let abiOutput = outputPath.replacingExtension(with: .jsonABIBaseline)
commandLine.appendPath(abiOutput)
outputs.append(TypedVirtualPath(file: abiOutput.intern(), type: .jsonABIBaseline))
}
return Job(
moduleName: moduleOutputInfo.name,
Expand Down
37 changes: 26 additions & 11 deletions Tests/SwiftDriverTests/SwiftDriverTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2182,10 +2182,11 @@ final class SwiftDriverTests: XCTestCase {
XCTAssert(plannedJobs[1].commandLine.contains(.flag("-import-objc-header")))

XCTAssertTrue(plannedJobs[2].tool.name.contains("swift"))
XCTAssertEqual(plannedJobs[2].outputs.count, 3)
XCTAssertEqual(plannedJobs[2].outputs.count, 4)
XCTAssertEqual(plannedJobs[2].outputs[0].file, .relative(RelativePath("Test.swiftmodule")))
XCTAssertEqual(plannedJobs[2].outputs[1].file, .relative(RelativePath("Test.swiftdoc")))
XCTAssertEqual(plannedJobs[2].outputs[2].file, .absolute(AbsolutePath("/foo/bar/Test.swiftsourceinfo")))
XCTAssertEqual(plannedJobs[2].outputs[3].file, .relative(RelativePath("Test.abi.json")))
XCTAssert(plannedJobs[2].commandLine.contains(.flag("-import-objc-header")))
}

Expand All @@ -2194,10 +2195,11 @@ final class SwiftDriverTests: XCTestCase {
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 3)
XCTAssertTrue(plannedJobs[2].tool.name.contains("swift"))
XCTAssertEqual(plannedJobs[2].outputs.count, 3)
XCTAssertEqual(plannedJobs[2].outputs.count, 4)
XCTAssertEqual(plannedJobs[2].outputs[0].file, .absolute(AbsolutePath("/foo/bar/Test.swiftmodule")))
XCTAssertEqual(plannedJobs[2].outputs[1].file, .absolute(AbsolutePath("/foo/bar/Test.swiftdoc")))
XCTAssertEqual(plannedJobs[2].outputs[2].file, .absolute(AbsolutePath("/foo/bar/Test.swiftsourceinfo")))
XCTAssertEqual(plannedJobs[2].outputs[3].file, .absolute(AbsolutePath("/foo/bar/Test.abi.json")))
}

do {
Expand All @@ -2206,10 +2208,11 @@ final class SwiftDriverTests: XCTestCase {
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 3)
XCTAssertTrue(plannedJobs[2].tool.name.contains("swift"))
XCTAssertEqual(plannedJobs[2].outputs.count, 3)
XCTAssertEqual(plannedJobs[2].outputs.count, 4)
XCTAssertEqual(plannedJobs[2].outputs[0].file, .relative(RelativePath("Test.swiftmodule")))
XCTAssertEqual(plannedJobs[2].outputs[1].file, .relative(RelativePath("Test.swiftdoc")))
XCTAssertEqual(plannedJobs[2].outputs[2].file, .relative(RelativePath("Test.swiftsourceinfo")))
XCTAssertEqual(plannedJobs[2].outputs[3].file, .relative(RelativePath("Test.abi.json")))
}

do {
Expand All @@ -2218,10 +2221,11 @@ final class SwiftDriverTests: XCTestCase {
let plannedJobs = try driver.planBuild()
XCTAssertEqual(plannedJobs.count, 3)
XCTAssertTrue(plannedJobs[2].tool.name.contains("swift"))
XCTAssertEqual(plannedJobs[2].outputs.count, 3)
XCTAssertEqual(plannedJobs[2].outputs.count, 4)
XCTAssertEqual(plannedJobs[2].outputs[0].file, .relative(RelativePath("Test.swiftmodule")))
XCTAssertEqual(plannedJobs[2].outputs[1].file, .relative(RelativePath("Test.swiftdoc")))
XCTAssertEqual(plannedJobs[2].outputs[2].file, .relative(RelativePath("Test.swiftsourceinfo")))
XCTAssertEqual(plannedJobs[2].outputs[3].file, .relative(RelativePath("Test.abi.json")))
}

do {
Expand All @@ -2246,10 +2250,11 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertEqual(Set(plannedJobs.map { $0.kind }), Set([.compile, .emitModule, .link]))
XCTAssertTrue(plannedJobs[0].tool.name.contains("swift"))
XCTAssertTrue(plannedJobs[0].commandLine.contains(.flag("-parse-as-library")))
XCTAssertEqual(plannedJobs[0].outputs.count, 3)
XCTAssertEqual(plannedJobs[0].outputs.count, 4)
XCTAssertEqual(plannedJobs[0].outputs[0].file, .absolute(AbsolutePath("/foo/bar/Test.swiftmodule")))
XCTAssertEqual(plannedJobs[0].outputs[1].file, .absolute(AbsolutePath("/foo/bar/Test.swiftdoc")))
XCTAssertEqual(plannedJobs[0].outputs[2].file, .absolute(AbsolutePath("/foo/bar/Test.swiftsourceinfo")))
XCTAssertEqual(plannedJobs[0].outputs[3].file, .absolute(AbsolutePath("/foo/bar/Test.abi.json")))

// We don't know the output file of the symbol graph, just make sure the flag is passed along.
XCTAssertTrue(plannedJobs[0].commandLine.contains(.flag("-emit-symbol-graph-dir")))
Expand All @@ -2263,10 +2268,11 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertEqual(plannedJobs.count, 1)
XCTAssertEqual(Set(plannedJobs.map { $0.kind }), Set([.emitModule]))
XCTAssertTrue(plannedJobs[0].tool.name.contains("swift"))
XCTAssertEqual(plannedJobs[0].outputs.count, 3)
XCTAssertEqual(plannedJobs[0].outputs.count, 4)
XCTAssertEqual(plannedJobs[0].outputs[0].file, .absolute(AbsolutePath("/foo/bar/Test.swiftmodule")))
XCTAssertEqual(plannedJobs[0].outputs[1].file, .absolute(AbsolutePath("/foo/bar/Test.swiftdoc")))
XCTAssertEqual(plannedJobs[0].outputs[2].file, .absolute(AbsolutePath("/foo/bar/Test.swiftsourceinfo")))
XCTAssertEqual(plannedJobs[0].outputs[3].file, .absolute(AbsolutePath("/foo/bar/Test.abi.json")))
}

do {
Expand Down Expand Up @@ -3485,6 +3491,8 @@ final class SwiftDriverTests: XCTestCase {
"emitModule (swift-frontend)" -> "test.swiftmodule" [color=green];
"test.swiftdoc" [fontsize=12];
"emitModule (swift-frontend)" -> "test.swiftdoc" [color=green];
"test.abi.json" [fontsize=12];
"emitModule (swift-frontend)" -> "test.abi.json" [color=green];
"compile (swift-frontend)" [style=bold];
"test.swift" -> "compile (swift-frontend)" [color=blue];
"test-1.o" [fontsize=12];
Expand Down Expand Up @@ -3512,6 +3520,8 @@ final class SwiftDriverTests: XCTestCase {
"emitModule (swift-frontend)" -> "test.swiftmodule" [color=green];
"test.swiftdoc" [fontsize=12];
"emitModule (swift-frontend)" -> "test.swiftdoc" [color=green];
"test.abi.json" [fontsize=12];
"emitModule (swift-frontend)" -> "test.abi.json" [color=green];
"compile (swift-frontend)" [style=bold];
"test.swift" -> "compile (swift-frontend)" [color=blue];
"test-1.o" [fontsize=12];
Expand Down Expand Up @@ -4542,10 +4552,11 @@ final class SwiftDriverTests: XCTestCase {
let emitModuleJob = plannedJobs.first(where: {$0.kind == .emitModule})!
XCTAssertEqual(emitModuleJob.inputs.count, 1)
XCTAssertEqual(emitModuleJob.inputs[0].file, .relative(RelativePath("embed-bitcode.swift")))
XCTAssertEqual(emitModuleJob.outputs.count, 3)
XCTAssertEqual(emitModuleJob.outputs.count, 4)
XCTAssertEqual(emitModuleJob.outputs[0].file, .relative(RelativePath("main.swiftmodule")))
XCTAssertEqual(emitModuleJob.outputs[1].file, .relative(RelativePath("main.swiftdoc")))
XCTAssertEqual(emitModuleJob.outputs[2].file, .relative(RelativePath("main.swiftsourceinfo")))
XCTAssertEqual(emitModuleJob.outputs[3].file, .relative(RelativePath("main.abi.json")))
}

do {
Expand Down Expand Up @@ -4600,10 +4611,11 @@ final class SwiftDriverTests: XCTestCase {
XCTAssertEqual(emitModuleJob.inputs.count, 2)
XCTAssertEqual(emitModuleJob.inputs[0].file, .relative(RelativePath("embed-bitcode.swift")))
XCTAssertEqual(emitModuleJob.inputs[1].file, .relative(RelativePath("empty.swift")))
XCTAssertEqual(emitModuleJob.outputs.count, 3)
XCTAssertEqual(emitModuleJob.outputs.count, 4)
XCTAssertEqual(emitModuleJob.outputs[0].file, .relative(RelativePath("ABC.swiftmodule")))
XCTAssertEqual(emitModuleJob.outputs[1].file, .relative(RelativePath("ABC.swiftdoc")))
XCTAssertEqual(emitModuleJob.outputs[2].file, .relative(RelativePath("ABC.swiftsourceinfo")))
XCTAssertEqual(emitModuleJob.outputs[3].file, .relative(RelativePath("ABC.abi.json")))
}

do {
Expand Down Expand Up @@ -4854,10 +4866,11 @@ final class SwiftDriverTests: XCTestCase {
let plannedJobs = try driver.planBuild()
let emitModuleJob = plannedJobs[0]
XCTAssertTrue(emitModuleJob.commandLine.contains(.flag("-emit-module-source-info-path")))
XCTAssertEqual(emitModuleJob.outputs.count, 3)
XCTAssertEqual(emitModuleJob.outputs.count, 4)
XCTAssertTrue(emitModuleJob.outputs[0].file == VirtualPath.relative(RelativePath("foo.swiftmodule")))
XCTAssertTrue(emitModuleJob.outputs[1].file == VirtualPath.relative(RelativePath("foo.swiftdoc")))
XCTAssertTrue(emitModuleJob.outputs[2].file == VirtualPath.relative(RelativePath("foo.swiftsourceinfo")))
XCTAssertTrue(emitModuleJob.outputs[3].file == VirtualPath.relative(RelativePath("foo.abi.json")))
}
// implicit with Project/ Directory
do {
Expand All @@ -4870,10 +4883,11 @@ final class SwiftDriverTests: XCTestCase {
let plannedJobs = try driver.planBuild()
let emitModuleJob = plannedJobs[0]
XCTAssertTrue(emitModuleJob.commandLine.contains(.flag("-emit-module-source-info-path")))
XCTAssertEqual(emitModuleJob.outputs.count, 3)
XCTAssertEqual(emitModuleJob.outputs.count, 4)
XCTAssertEqual(emitModuleJob.outputs[0].file, .absolute(path.appending(component: "foo.swiftmodule")))
XCTAssertEqual(emitModuleJob.outputs[1].file, .absolute(path.appending(component: "foo.swiftdoc")))
XCTAssertEqual(emitModuleJob.outputs[2].file, .absolute(projectDirPath.appending(component: "foo.swiftsourceinfo")))
XCTAssertEqual(emitModuleJob.outputs[3].file, .absolute(path.appending(component: "foo.abi.json")))
}
}
// avoid implicit swiftsourceinfo
Expand All @@ -4882,9 +4896,10 @@ final class SwiftDriverTests: XCTestCase {
let plannedJobs = try driver.planBuild()
let emitModuleJob = plannedJobs[0]
XCTAssertFalse(emitModuleJob.commandLine.contains(.flag("-emit-module-source-info-path")))
XCTAssertEqual(emitModuleJob.outputs.count, 2)
XCTAssertEqual(emitModuleJob.outputs.count, 3)
XCTAssertTrue(emitModuleJob.outputs[0].file == VirtualPath.relative(RelativePath("foo.swiftmodule")))
XCTAssertTrue(emitModuleJob.outputs[1].file == VirtualPath.relative(RelativePath("foo.swiftdoc")))
XCTAssertTrue(emitModuleJob.outputs[2].file == VirtualPath.relative(RelativePath("foo.abi.json")))
}
}

Expand Down