Skip to content

Fix typos in declarations of swift_ptrauth_key_associated_type and swift_ptrauth_key_associated_conformance #30363

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

Merged
merged 1 commit into from
Mar 12, 2020
Merged

Fix typos in declarations of swift_ptrauth_key_associated_type and swift_ptrauth_key_associated_conformance #30363

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions stdlib/public/runtime/Metadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4301,8 +4301,10 @@ static bool doesNotRequireInstantiation(
return true;
}

#if SWIFT_PTRAUTH
static const unsigned swift_ptrauth_key_associated_type =
swift_ptrauth_key_associated_type;
ptrauth_key_process_independent_code;
#endif

/// Given an unsigned pointer to an associated-type protocol witness,
/// fill in the appropriate slot in the witness table we're building.
Expand All @@ -4316,10 +4318,10 @@ static void initAssociatedTypeProtocolWitness(const Metadata **slot,
swift_ptrauth_init(slot, witness, reqt.Flags.getExtraDiscriminator());
}

#if SWIFT_PTRAUTH
static const unsigned swift_ptrauth_key_associated_conformance =
swift_ptrauth_key_associated_conformance;
ptrauth_key_process_independent_code;

#if SWIFT_PTRAUTH
/// Given an unsigned pointer to an associated-conformance protocol witness,
/// fill in the appropriate slot in the witness table we're building.
static void initAssociatedConformanceProtocolWitness(void **slot, void *witness,
Expand Down