Add arm64e and pointer authentication support for Swift #30112
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
|
The IRGen test conflicts should be trivial to fix: in this patch, the 64-bit test line has been split into ptrauth and non-ptrauth variants, so non just copy the new symbol name from the single 64-bit line into both, preserving the |
|
@swift-ci please test |
|
Build failed |
|
Build failed |
|
@swift-ci please test |
1 similar comment
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test |
|
@swift-ci please test |
|
Build failed |
|
@swift-ci please test |
smeenai
reviewed
Mar 11, 2020
There was a problem hiding this comment.
This broke builds for me:
<swift>/stdlib/public/runtime/Metadata.cpp:4645:40: error: expression is not an integer constant expression
witness = ptrauth_auth_data(witness, swift_ptrauth_key_associated_type,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
<clang>/usr/lib/clang/11.0.0/include/ptrauth.h:236:35: note: expanded from macro 'ptrauth_auth_data'
__builtin_ptrauth_auth(__value, __old_key, __old_data)
^~~~~~~~~
<swift>/stdlib/public/runtime/Metadata.cpp:4767:40: error: expression is not an integer constant expression
witness = ptrauth_auth_data(witness, swift_ptrauth_key_associated_type,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
<clang>/usr/lib/clang/11.0.0/include/ptrauth.h:236:35: note: expanded from macro 'ptrauth_auth_data'
__builtin_ptrauth_auth(__value, __old_key, __old_data)
^~~~~~~~~
<swift>/stdlib/public/runtime/Metadata.cpp:4818:26: error: expression is not an integer constant expression
witness, swift_ptrauth_key_associated_conformance,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
<clang>/usr/lib/clang/11.0.0/include/ptrauth.h:236:35: note: expanded from macro 'ptrauth_auth_data'
__builtin_ptrauth_auth(__value, __old_key, __old_data)
^~~~~~~~~
<swift>/stdlib/public/runtime/Metadata.cpp:4894:40: error: expression is not an integer constant expression
witness = ptrauth_auth_data(witness, swift_ptrauth_key_associated_conformance,
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
<clang>/usr/lib/clang/11.0.0/include/ptrauth.h:236:35: note: expanded from macro 'ptrauth_auth_data'
__builtin_ptrauth_auth(__value, __old_key, __old_data)
^~~~~~~~~
4 errors generated.
| @@ -4207,6 +4301,110 @@ static bool doesNotRequireInstantiation( | |||
| return true; | |||
| } | |||
|
|
|||
| static const unsigned swift_ptrauth_key_associated_type = | |||
There was a problem hiding this comment.
Was it intentional to assign this variable to itself? Clang accepts this without warning :/
| swift_ptrauth_init(slot, witness, reqt.Flags.getExtraDiscriminator()); | ||
| } | ||
|
|
||
| static const unsigned swift_ptrauth_key_associated_conformance = |
smeenai
reviewed
Mar 11, 2020
| @@ -4207,6 +4301,110 @@ static bool doesNotRequireInstantiation( | |||
| return true; | |||
| } | |||
|
|
|||
| static const unsigned swift_ptrauth_key_associated_type = | |||
| swift_ptrauth_key_associated_type; | |||
There was a problem hiding this comment.
I don't see any way to expand the context around my previous comment, so this is where the self-assignment is happening.
|
Ah, I see #30363. |
smeenai
added a commit
to llvm/llvm-project
that referenced
this pull request
Mar 12, 2020
swiftlang/swift#30112 makes the Swift standard library for iOS build for arm64e. If you're building Swift against your own LLVM, this in turn requires having the builtins built for arm64e, otherwise you won't be able to use the builtins (which will in turn lead to an undefined symbol for `__isOSVersionAtLeast`). Make the builtins build for arm64e to fix this. Differential Revision: https://reviews.llvm.org/D76041
arichardson
pushed a commit
to arichardson/llvm-project
that referenced
this pull request
Apr 2, 2020
swiftlang/swift#30112 makes the Swift standard library for iOS build for arm64e. If you're building Swift against your own LLVM, this in turn requires having the builtins built for arm64e, otherwise you won't be able to use the builtins (which will in turn lead to an undefined symbol for `__isOSVersionAtLeast`). Make the builtins build for arm64e to fix this. Differential Revision: https://reviews.llvm.org/D76041
mem-frob
pushed a commit
to draperlaboratory/hope-llvm-project
that referenced
this pull request
Oct 7, 2022
swiftlang/swift#30112 makes the Swift standard library for iOS build for arm64e. If you're building Swift against your own LLVM, this in turn requires having the builtins built for arm64e, otherwise you won't be able to use the builtins (which will in turn lead to an undefined symbol for `__isOSVersionAtLeast`). Make the builtins build for arm64e to fix this. Differential Revision: https://reviews.llvm.org/D76041
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.
This PR upstreams the internally developed support for arm64e and pointer authentication in Swift. For details about pointer authentication, see http://lists.llvm.org/pipermail/llvm-dev/2019-October/136091.html, and for the LLVM and Clang changes, see swiftlang/llvm-project#14. This work is primarily authored by John McCall, with many smaller contributions by several others at Apple including myself.