[swiftinterface] Handle target variants the same as targets - #77156
Merged
drodriguez merged 1 commit intoOct 22, 2024
Conversation
Contributor
Author
|
@swift-ci please test |
tshortli
reviewed
Oct 22, 2024
tshortli
left a comment
tshortli
left a comment
Contributor
There was a problem hiding this comment.
Thanks for taking care of this! Out of curiosity, what assertion are you hitting without this fix? I thought the SILGen assertion I removed was the only one that was being triggered.
Contributor
Author
It was the I will try to make the triple checks into a function/lambda and send a new version. |
Based on preliminary work from @rhow. The compilation arguments for a swiftinterface file are preprocessed to modify the `-target` argument to match the preferred target (which comes from the command line) in cases in which the sub-architecture differs, but it is compatible (for example using `arm64e` when `arm64` is being compiled), but this was not done for the target variant, which ended up with mismatches on the sub-architecture used by the target and target variant, which fails an assert in assert toolchains.
drodriguez
force-pushed
the
swiftinterface-target-variant
branch
from
October 22, 2024 17:40
9563f32 to
0b14bdc
Compare
Contributor
Author
|
@swift-ci please test |
tshortli
approved these changes
Oct 22, 2024
drodriguez
enabled auto-merge (squash)
October 22, 2024 17:52
nkcsgexi
added a commit
that referenced
this pull request
Dec 18, 2024
Revert "[swiftinterface] Handle target variants the same as targets (#77156)"
tshortli
added a commit
to tshortli/swift
that referenced
this pull request
Jan 2, 2025
In swiftlang#77156, normalization was introduced for -target-variant triples. That PR also caused -target-variant arguments to be inherited from the main compilation options whenever building dependency modules from their interfaces, which is incorrect. The -target-variant option must only be specified when compiling a "zippered" module, but the dependencies of zippered modules are not necessarily zippered themselves and indiscriminantly propagating the option can cause miscompilation. The new, more targeted approach to normalizing arm64e triples simply uses the arch and subarch of the -target argument of the main compile to decide whether the subarch of both the -target and -target-variant arguments of a dependency need adjustment. Resolves rdar://135322077 and rdar://141640919.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Based on preliminary work from @rmaz.
The compilation arguments for a swiftinterface file are preprocessed to modify the
-targetargument to match the preferred target (which comes from the command line) in cases in which the sub-architecture differs, but it is compatible (for example usingarm64ewhenarm64is being compiled), but this was not done for the target variant, which ended up with mismatches on the sub-architecture used by the target and target variant, which fails an assert in assert toolchains.Maybe solves rdar://135322077