averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Runtime] Add ptrauth attribute to TargetGlobalActorReference conformance pointer.

Browse Source 
When the TargetGlobalActorReference conformance is an indirect pointer, the indirect pointer is signed when ptrauth is enabled.

rdar://151945202
This commit is contained in:
Mike Ash
2025-05-28 21:05:09 -04:00
parent 8b4740f0cc
commit ea785c191c
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/swift/ABI/Metadata.h
View File

@@ -2787,11 +2787,22 @@ using ResilientWitnessesHeader = TargetResilientWitnessesHeader<InProcess>;
/// global actor protocol.
template<typename Runtime>
struct TargetGlobalActorReference {
private:
using SignedDescriptorPointer =
const TargetProtocolConformanceDescriptor<Runtime>
*__ptrauth_swift_protocol_conformance_descriptor;
public:
/// The type of the global actor.
RelativeDirectPointer<const char, /*nullable*/ false> type;
/// The conformance of the global actor to the GlobalActor protocol.
TargetRelativeProtocolConformanceDescriptorPointer<Runtime> conformance;
RelativeIndirectablePointer<
const TargetProtocolConformanceDescriptor<Runtime>,
/*nullable*/ false,
/*offset*/ int32_t,
/*indirect type*/ SignedDescriptorPointer>
conformance;
};
/// Describes the context of a protocol conformance that is relevant when

4
include/swift/Runtime/Config.h
View File

@@ -272,6 +272,9 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
#define __ptrauth_swift_type_descriptor \
__ptrauth(ptrauth_key_process_independent_data, 1, \
SpecialPointerAuthDiscriminators::TypeDescriptor)
#define __ptrauth_swift_protocol_conformance_descriptor \
__ptrauth(ptrauth_key_process_independent_data, 1, \
SpecialPointerAuthDiscriminators::ProtocolConformanceDescriptor)
#define __ptrauth_swift_dynamic_replacement_key \
__ptrauth(ptrauth_key_process_independent_data, 1, \
SpecialPointerAuthDiscriminators::DynamicReplacementKey)
@@ -365,6 +368,7 @@ extern uintptr_t __COMPATIBILITY_LIBRARIES_CANNOT_CHECK_THE_IS_SWIFT_BIT_DIRECTL
#define __ptrauth_swift_runtime_function_entry_strip(__fn) (__fn)
#define __ptrauth_swift_heap_object_destructor
#define __ptrauth_swift_type_descriptor
#define __ptrauth_swift_protocol_conformance_descriptor
#define __ptrauth_swift_nonunique_extended_existential_type_shape
#define __ptrauth_swift_dynamic_replacement_key
#define swift_ptrauth_sign_opaque_read_resume_function(__fn, __buffer) (__fn)