8268478: JVMCI tests failing after JDK-8268052

Tom Rodriguez · Tom Rodriguez · commit b41f3f8ed512 · 2021-06-09T23:04:45.000Z
Reviewed-by: kvn, eosterlund
diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp
@@ -1805,6 +1805,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,
           }
         } else {
           assert(!nmethod_mirror.is_hotspot() || data->get_nmethod_mirror(nm, /* phantom_ref */ false) == HotSpotJVMCI::resolve(nmethod_mirror), "must be");
+          MutexLocker ml(CompiledMethod_lock, Mutex::_no_safepoint_check_flag);
           if (!nm->make_in_use()) {
             result = JVMCI::nmethod_reclaimed;
           }

Original file line number	Diff line number	Diff line change
`@@ -1805,6 +1805,7 @@ JVMCI::CodeInstallResult JVMCIRuntime::register_method(JVMCIEnv* JVMCIENV,`
`1805`	`1805`	`}`
`1806`	`1806`	`} else {`
`1807`	`1807`	`assert(!nmethod_mirror.is_hotspot() \|\| data->get_nmethod_mirror(nm, /* phantom_ref */ false) == HotSpotJVMCI::resolve(nmethod_mirror), "must be");`
	`1808`	`+ MutexLocker ml(CompiledMethod_lock, Mutex::_no_safepoint_check_flag);`
`1808`	`1809`	`if (!nm->make_in_use()) {`
`1809`	`1810`	`result = JVMCI::nmethod_reclaimed;`
`1810`	`1811`	`}`