Merge pull request swiftlang#20462 from aschwaighofer/dyn_repl_entry_point_must_hold_lock

swift-ci · web-flow · commit aa3e16dc8f18 · 2018-11-09T09:57:01.000-08:00
diff --git a/stdlib/public/runtime/MetadataLookup.cpp b/stdlib/public/runtime/MetadataLookup.cpp
@@ -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"

Original file line number	Diff line number	Diff line change
`@@ -1645,12 +1645,14 @@ void swift::addImageDynamicReplacementBlockCallback(`
`1645`	`1645`	`[&] { automaticReplacements->enableReplacements(); });`
`1646`	`1646`	`}`
`1647`	`1647`
`1648`		`-void swift::swift_enableDynamicReplacementScope(const DynamicReplacementScope *scope) {`
`1649`		`- scope->enable();`
	`1648`	`+void swift::swift_enableDynamicReplacementScope(`
	`1649`	`+ const DynamicReplacementScope *scope) {`
	`1650`	`+ DynamicReplacementLock.get().withLock([=] { scope->enable(); });`
`1650`	`1651`	`}`
`1651`	`1652`
`1652`		`-void swift::swift_disableDynamicReplacementScope(const DynamicReplacementScope *scope) {`
`1653`		`- scope->disable();`
	`1653`	`+void swift::swift_disableDynamicReplacementScope(`
	`1654`	`+ const DynamicReplacementScope *scope) {`
	`1655`	`+ DynamicReplacementLock.get().withLock([=] { scope->disable(); });`
`1654`	`1656`	`}`
`1655`	`1657`	`#define OVERRIDE_METADATALOOKUP COMPATIBILITY_OVERRIDE`
`1656`	`1658`	`#include "CompatibilityOverride.def"`