Skip to content

[5.9][Runtime] Add ptrauth to standard concurrency descriptors. #66211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
May 30, 2023
Merged

[5.9][Runtime] Add ptrauth to standard concurrency descriptors. #66211

merged 1 commit into from
May 30, 2023

Conversation

mikeash
Copy link
Contributor

@mikeash mikeash commented May 30, 2023

Cherry-pick #66210 to release/5.9.

Put the __ptrauth_swift_type_descriptor qualifier on the fields of ConcurrencyStandardTypeDescriptors.

@mikeash
[5.9][Runtime] Add ptrauth to standard concurrency descriptors.
78948b7 
Put the __ptrauth_swift_type_descriptor qualifier on the fields of ConcurrencyStandardTypeDescriptors.

(cherry picked from commit bf868b0)
@mikeash mikeash requested a review from a team as a code owner May 30, 2023 14:32
@eeckstein eeckstein self-requested a review May 30, 2023 14:44
eeckstein
eeckstein approved these changes May 30, 2023
View reviewed changes
Copy link
Contributor

@eeckstein eeckstein left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@mikeash
Copy link
Contributor Author

mikeash commented May 30, 2023

• Description: This protects the static ConcurrencyStandardTypeDescriptors struct with ptrauth.
• Risk: Very low. This struct exists to coordinate the concurrency runtime with libswiftCore. Both sides use the same declaration. If they somehow disagree, it will fail quickly and obviously.
• Original PR: #66210
• Reviewed By: @eeckstein
• Testing: Manually verified the fixups in the built dylib. Swift's test suite will thoroughly exercise this change.
• Resolves: rdar://110005070

@mikeash
Copy link
Contributor Author

mikeash commented May 30, 2023

@swift-ci please test

@mikeash mikeash merged commit ac9bf64 into swiftlang:release/5.9 May 30, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ktoso ktoso ktoso approved these changes

@airspeedswift airspeedswift airspeedswift approved these changes

@eeckstein eeckstein eeckstein approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mikeash @ktoso @airspeedswift @eeckstein