[Serialization] Use full target architectures for swiftmodule files #21053
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
requested review from
graydon,
rjmccall,
DougGregor and
jakepetroules
|
@swift-ci Please test |
|
Build failed |
|
@swift-ci Please clean test Linux |
jakepetroules
approved these changes
Dec 6, 2018
compnerd
reviewed
Dec 6, 2018
| @@ -142,6 +142,23 @@ bool SerializedModuleLoader::maybeDiagnoseArchitectureMismatch( | |||
| return true; | |||
| } | |||
|
|
|||
| static std::pair<llvm::SmallString<16>, llvm::SmallString<16>> | |||
| getArchSpecificModuleFileNames(StringRef archName) { | |||
There was a problem hiding this comment.
Why not pass along the Triple rather than StringRef? It feels like it would be nicer to derive that from the triple rather than the architecture name specifically. We could have a boolean flag for whether it should do the fallback or not.
There was a problem hiding this comment.
I don't think that actually makes the call sites nicer, and as a helper function that's the important thing.
| archDocFile += file_types::getExtension(file_types::TY_SwiftModuleDocFile); | ||
| } | ||
| // FIXME: We used to use "major architecture" names for these files---the | ||
| // names checked in "#if os(...)". Fall back to that name in the one case |
There was a problem hiding this comment.
Did you really mean #if os(...) or do you mean #if arch(...)?
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
jrose-apple
force-pushed
the
right-on-target
branch
from
3fea4f4 to
040357a
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please test source compatibility |
jrose-apple
added a commit
to jrose-apple/swift
that referenced
this pull request
Dec 6, 2018
…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)
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 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