From 33016a8325c98eed8fb93b46c59f88a68d6cc019 Mon Sep 17 00:00:00 2001 From: Bob Vandette Date: Wed, 22 Jul 2020 17:59:33 +0000 Subject: [PATCH 1/2] 8249880: JVMCI calling register_nmethod without CodeCache lock Reviewed-by: eosterlund, kvn, never --- src/hotspot/share/jvmci/jvmciRuntime.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/hotspot/share/jvmci/jvmciRuntime.cpp b/src/hotspot/share/jvmci/jvmciRuntime.cpp index e603452618f..729b2058c80 100644 --- a/src/hotspot/share/jvmci/jvmciRuntime.cpp +++ b/src/hotspot/share/jvmci/jvmciRuntime.cpp @@ -668,6 +668,7 @@ void JVMCINMethodData::set_nmethod_mirror(nmethod* nm, oop new_mirror) { // Since we've patched some oops in the nmethod, // (re)register it with the heap. + MutexLocker ml(CodeCache_lock, Mutex::_no_safepoint_check_flag); Universe::heap()->register_nmethod(nm); } From 54ad4f9a80d093b10fd59a83c1fcc51737d6c430 Mon Sep 17 00:00:00 2001 From: Mikael Vidstedt Date: Wed, 22 Jul 2020 19:17:32 -0700 Subject: [PATCH 2/2] Added tag jdk-15+33 for changeset 6b65f4e7a975 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 6248a85e0b3..c1ea965a6e2 100644 --- a/.hgtags +++ b/.hgtags @@ -647,3 +647,4 @@ b58fc60580550a4a587cab729d8fd87223ad6932 jdk-15+29 6909e4a1f25bfe9a2727026f5845fc1fc44a36aa jdk-15+30 a32f58c6b8be81877411767de7ba9c4cf087c1b5 jdk-15+31 2dad000726b8d5db9f3df647fb4949d88f269dd4 jdk-15+32 +6b65f4e7a975628df51ef755b02642075390041d jdk-15+33