[5.0] [Serialization] Use full target architectures for swiftmodule files #21096
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 |
AnnaZaks
approved these changes
Dec 6, 2018
|
Build failed |
|
Build failed |
…wiftlang#21053) Previously these used the same "major architecture" names that the `#if os(...)` query accepts, but that can be a problem when building for, say, both armv7 and armv7s, even if the content is "the same". For a transition period where external build tools are involved, the compiler will look for "arm.swiftmodule" if it fails to find "armv7.swiftmodule" or any other 32-bit ARM architecture. No other Apple platform architectures are affected, and AFAIK no one's using the architecture-based layout on Linux or any other platforms. rdar://problem/45174692 (cherry picked from commit 06f3c11)
jrose-apple
force-pushed
the
5.0-right-on-target
branch
from
8b3b79c to
f934caf
Compare
|
*sigh* Resolved the master/5.0 differences wrong. @swift-ci Please test |
|
@swift-ci Please test source compatibility |
|
Build failed |
|
Build failed |
|
Source compat failures are UPASSs; what's more, they're UPASSs in SwiftPM projects, which are not affected by this. |
jrose-apple
added a commit
to jrose-apple/swift
that referenced
this pull request
Dec 19, 2018
… files (swiftlang#21096)" This reverts commit b5e2b94.
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.
Explanation: Swiftmodules in frameworks are stored under the name of their "major architecture" (the name used by
#if arch(…)), but that creates complications for platforms that have more than one architecture variant per major architecture, like armv7 and armv7s, even if the content is "the same".Scope: In practice, only affects how the compiler imports frameworks, which only Xcode builds.
Issue: rdar://problem/45174692
Risk: Low. This change is backwards-compatible for all shipping Apple platforms, and non-Apple platforms don't use multi-architecture Swift modules.
Testing: Passed regression tests and the source compat suite.
Reviewed by: @rjmccall, @jakepetroules