src/hotspot/share/gc/shenandoah/shenandoahBarrierSetNMethod.cpp

*** 70,8 ***
  
    // CodeCache unloading support
    nm->mark_as_maybe_on_stack();
  
    // Disarm
!   ShenandoahNMethod::disarm_nmethod(nm);
    return true;
  }
--- 70,8 ---
  
    // CodeCache unloading support
    nm->mark_as_maybe_on_stack();
  
    // Disarm
!   ShenandoahNMethod::disarm_nmethod_unlocked(nm);
    return true;
  }