[ModuleInterfaces] Combine the normalized target triple into the cache hash #27469
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
jrose-apple
reviewed
Oct 1, 2019
harlanhaskins
force-pushed
the
target-acquired
branch
2 times, most recently
from
a2b3bbf to
dea6d75
Compare
edymtt
reviewed
Oct 1, 2019
harlanhaskins
force-pushed
the
target-acquired
branch
from
dea6d75 to
7329481
Compare
|
@swift-ci please test |
beccadax
requested changes
Oct 1, 2019
| // across targets. Note that we this normalization explicitly doesn't | ||
| // include the minimum deployment target (e.g. the '12.0' in 'ios12.0'). | ||
| auto normalizedTargetTriple = | ||
| getTargetSpecificModuleTriple(SubInvocation.getLangOptions().Target); |
There was a problem hiding this comment.
@compnerd I notice that Android drops the API version when it normalizes the target triple. Will that behavior be appropriate here?
|
Build failed |
|
Build failed |
edymtt
approved these changes
Oct 2, 2019
…e hash Previously, we'd combine just the target architecture, and rely on the fact that the .swiftinterface is in a reasonably-target-specific subdirectory to include enough entropy to avoid hash collisions. But in the presence of a VFS or if two targets are sharing the same .swiftinterface file (which can sometimes happen in tests), they will collide since the hash only includes architecture. Instead, use the same normalization that the serialized module loader uses, and serialize the normalized target triple instead. Fixes rdar://55881335
harlanhaskins
force-pushed
the
target-acquired
branch
from
7329481 to
c090816
Compare
|
@swift-ci please test |
|
Build failed |
|
Build failed |
|
LLDB failure is unrelated @swift-ci please test Linux |
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.
Previously, we'd combine just the target architecture, and rely on the
fact that the .swiftinterface is in a reasonably-target-specific
subdirectory to include enough entropy to avoid hash collisions. But in
the presence of a VFS or if two targets are sharing the same
.swiftinterface file (which can sometimes happen in tests), they will
collide since the hash only includes architecture.
Instead, use the same normalization that the serialized module loader
uses, and serialize the normalized target triple instead.
Fixes rdar://55881335