Override -triple on fallback to arm64e interface #39315
Merged
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
|
@swift-ci please test Apple Silicon |
|
@swift-ci please test |
|
Once the present test runs have finished, I'll push the re-enablement of stdlib/Reflection_objc.swift, which appears to have been related to this. |
etcwilde
reviewed
Sep 15, 2021
| // architecture slice. Use the original subarchitecture. | ||
| llvm::Triple parsedTargetTriple(subInvocation.getTargetTriple()); | ||
| if (parsedTargetTriple.getSubArch() != originalTargetTriple.getSubArch() && | ||
| parsedTargetTriple.getArch() == originalTargetTriple.getArch() && |
There was a problem hiding this comment.
Style thoughts, but I usually like to throw massive comparison-chains in a std::tie
e.g.
if (pTT.getSubArch() != oTT.getSubArch() &&
std::tie(pTT.getArch(), pTT.getVendor(), pTT.getOS(), pTT.getEnvironment()) == std::tie(oTT.getArch(), oTT.getVendor(), oTT.getOS(), oTT.getEnvironment())) {
//...
}I feel like it hides the redundant == and shows what is equal and what is different more clearly.
I'll leave it up to you, but just throwing it out there.
There was a problem hiding this comment.
That's going to give us a really, really really long line (and also cause a merge conflict), so I think I'll leave this as-is.
When we fall back to loading an arm64e module interface during an arm64 build, we want to compile it for the arm64 target so that it is fully compatible with the module that will load it, even though the flags in the file specify the arm64e target. Rewrite the sub-invocation's TargetTriple property in this specific situation. If the two targets differ by more than just the sub-architecture, we will continue to respect the -target flag in the file. Fixes <rdar://83056545>.
beccadax
force-pushed
the
how-do-i-take-my-e
branch
from
b9ec479 to
e16cf30
Compare
|
@swift-ci smoke test and merge |
|
Failure is unrelated; force-merging to clear Apple Silicon bot. |
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 we fall back to loading an arm64e module interface during an arm64 build, we want to compile it for the arm64 target so that it is fully compatible with the module that will load it, even though the flags in the file specify the arm64e target. Rewrite the sub-invocation's
TargetTripleproperty in this specific situation. If the two targets differ by more than just the sub-architecture, we will continue to respect the-targetflag in the file.Fixes rdar://83056545. Corrects implementation of #39083.