changeset 60134:c2452eb20d8a

8247670: Shenandoah: deadlock during class unloading OOME Reviewed-by: rkennke
author zgu
date Fri, 10 Jul 2020 11:40:57 -0400
parents dc2307a6511f
children 39b75aa17f21 cd766db99c40
files src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp	Fri Jul 10 11:52:35 2020 -0700
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.cpp	Fri Jul 10 11:40:57 2020 -0400
@@ -273,6 +273,7 @@
 
     // Heal oops and disarm
     if (_bs->is_armed(nm)) {
+      ShenandoahEvacOOMScope oom_evac_scope;
       ShenandoahNMethod::heal_nmethod_metadata(nm_data);
       _bs->disarm(nm);
     }
@@ -311,7 +312,6 @@
 
   virtual void work(uint worker_id) {
     ICRefillVerifierMark mark(_verifier);
-    ShenandoahEvacOOMScope evac_scope;
     _iterator.nmethods_do(&_cl);
   }