Skip to content

Runtime: Fix async dynamic replacements #37038

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
Apr 23, 2021
Merged

Runtime: Fix async dynamic replacements #37038

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions include/swift/ABI/Metadata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4897,6 +4897,9 @@ struct DynamicReplacementKey {
uint16_t getExtraDiscriminator() const {
return flags & 0x0000FFFF;
}
bool isAsync() const {
return ((flags >> 16 ) & 0x1);
}
};

/// A record describing a dynamic function replacement.
Expand Down
24 changes: 14 additions & 10 deletions stdlib/public/runtime/MetadataLookup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2309,30 +2309,33 @@ void DynamicReplacementDescriptor::enableReplacement() const {
auto *previous = chainRoot->next;
chainRoot->next = previous->next;
//chainRoot->implementationFunction = previous->implementationFunction;
swift_ptrauth_copy(
reinterpret_cast<void **>(&chainRoot->implementationFunction),
reinterpret_cast<void *const *>(&previous->implementationFunction),
replacedFunctionKey->getExtraDiscriminator());
swift_ptrauth_copy_code_or_data(
reinterpret_cast<void **>(&chainRoot->implementationFunction),
reinterpret_cast<void *const *>(&previous->implementationFunction),
replacedFunctionKey->getExtraDiscriminator(),
!replacedFunctionKey->isAsync());
}

// First populate the current replacement's chain entry.
auto *currentEntry =
const_cast<DynamicReplacementChainEntry *>(chainEntry.get());
// currentEntry->implementationFunction = chainRoot->implementationFunction;
swift_ptrauth_copy(
swift_ptrauth_copy_code_or_data(
reinterpret_cast<void **>(&currentEntry->implementationFunction),
reinterpret_cast<void *const *>(&chainRoot->implementationFunction),
replacedFunctionKey->getExtraDiscriminator());
replacedFunctionKey->getExtraDiscriminator(),
!replacedFunctionKey->isAsync());

currentEntry->next = chainRoot->next;

// Link the replacement entry.
chainRoot->next = chainEntry.get();
// chainRoot->implementationFunction = replacementFunction.get();
swift_ptrauth_init(
swift_ptrauth_init_code_or_data(
reinterpret_cast<void **>(&chainRoot->implementationFunction),
reinterpret_cast<void *>(replacementFunction.get()),
replacedFunctionKey->getExtraDiscriminator());
replacedFunctionKey->getExtraDiscriminator(),
!replacedFunctionKey->isAsync());
}

void DynamicReplacementDescriptor::disableReplacement() const {
Expand All @@ -2353,10 +2356,11 @@ void DynamicReplacementDescriptor::disableReplacement() const {
auto *previous = const_cast<DynamicReplacementChainEntry *>(prev);
previous->next = thisEntry->next;
// previous->implementationFunction = thisEntry->implementationFunction;
swift_ptrauth_copy(
swift_ptrauth_copy_code_or_data(
reinterpret_cast<void **>(&previous->implementationFunction),
reinterpret_cast<void *const *>(&thisEntry->implementationFunction),
replacedFunctionKey->getExtraDiscriminator());
replacedFunctionKey->getExtraDiscriminator(),
!replacedFunctionKey->isAsync());
}

/// An automatic dymamic replacement entry.
Expand Down