Ensure supplementary output file maps associate Swift Source inputs with expected outputs in WMO #1459
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ith expected outputs in WMO When handling invocations with many input kinds, it is important that the Swift compiler is passed a supplementary output filemap that maps the first `.swift` input to the expected outputs. It is already just a convention that we use the first input for a WMO compilation task. In cases where we use the first input which happens to not be a `.swift` input (e.g. a `.o` input), the Swift compiler fails to map it to expected output kinds of Swift compilation. Resolves rdar://115577783
|
@swift-ci test |
|
@swift-ci test |
etcwilde
reviewed
Nov 2, 2023
| @@ -686,7 +686,10 @@ extension Driver { | |||
| if let input = input?.fileHandle, input != OutputFileMap.singleInputKey { | |||
| entryInput = input | |||
| } else { | |||
| entryInput = inputFiles[0].fileHandle | |||
| guard let firstSourceInputHandle = inputFiles.first(where:{ $0.type == .swift })?.fileHandle else { | |||
There was a problem hiding this comment.
This is more like an assert, right? The driver should never try to form a frontend invocation if there aren't swift files to compile, right? Do we have a test that tries passing -wmo and doesn't pass any Swift source files? I seem to recall that crashing the driver for a while, so I hope so?
testWMOWithNonSourceInput seems like it's trying, but isn't quite that:
func testWMOWithNonSourceInput() throws {
var driver1 = try Driver(args: [
"swiftc", "-whole-module-optimization", "danger.o", "foo.swift", "bar.swift", "wibble.swift", "-module-name", "Test",
"-driver-filelist-threshold=0"
])
There was a problem hiding this comment.
testNoInputs seems to cover this well.
There was a problem hiding this comment.
I meant more like swiftc -wmo danger.o so there is an input. I just tried it with this change and it seems to work as expected.
|
@swift-ci test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When handling invocations with many input kinds, it is important that the Swift compiler is passed a supplementary output filemap that maps the first
.swiftinput to the expected outputs. It is already just a convention that we use the first input for a WMO compilation task. In cases where we use the first input which happens to not be a.swiftinput (e.g. a.oinput), the Swift compiler fails to map it to expected output kinds of Swift compilation.Resolves rdar://115577783