[GR-27902] Rare VM crash: "cannot lock a zombie method".

PullRequest: graal-jvmci-8/392
graalvm · Apr 17, 2021 · fa952e5 · fa952e5
2 parents a438628 + aedcdc5
commit fa952e5
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/share/vm/runtime/vm_operations.cpp b/src/share/vm/runtime/vm_operations.cpp
@@ -129,6 +129,7 @@ void VM_DeoptimizeNMethod::invalidate(nmethod* nm) {
     // Invalidating the HotSpotNmethod means we want the nmethod
     // to be deoptimized.
     nm->mark_for_deoptimization();
+    nm->make_not_entrant();
     VM_DeoptimizeNMethod op(nm);
     VMThread::execute(&op);
   }
@@ -146,8 +147,6 @@ void VM_DeoptimizeNMethod::doit() {
 
   // Deoptimize all activations depending on marked nmethods
   Deoptimization::deoptimize_dependents();
-
-  _nm->make_not_entrant();
 }
 
 #ifndef PRODUCT