Skip to content

The runtime entry points for enabling/disabling a dynamic replacement scope also must hold the lock #20462

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.

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
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions stdlib/public/runtime/MetadataLookup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1645,12 +1645,14 @@ void swift::addImageDynamicReplacementBlockCallback(
[&] { automaticReplacements->enableReplacements(); });
}

void swift::swift_enableDynamicReplacementScope(const DynamicReplacementScope *scope) {
scope->enable();
void swift::swift_enableDynamicReplacementScope(
const DynamicReplacementScope *scope) {
DynamicReplacementLock.get().withLock([=] { scope->enable(); });
}

void swift::swift_disableDynamicReplacementScope(const DynamicReplacementScope *scope) {
scope->disable();
void swift::swift_disableDynamicReplacementScope(
const DynamicReplacementScope *scope) {
DynamicReplacementLock.get().withLock([=] { scope->disable(); });
}
#define OVERRIDE_METADATALOOKUP COMPATIBILITY_OVERRIDE
#include "CompatibilityOverride.def"