src/hotspot/share/gc/shenandoah/shenandoahClosures.inline.hpp

@@ -207,19 +207,17 @@
  void ShenandoahCleanUpdateWeakOopsClosure<CONCURRENT, IsAlive, KeepAlive>::do_oop(narrowOop* p) {
    ShouldNotReachHere();
  }
  
  ShenandoahNMethodAndDisarmClosure::ShenandoahNMethodAndDisarmClosure(OopClosure* cl) :
-   NMethodToOopClosure(cl, true /* fix_relocations */),
-    _bs(BarrierSet::barrier_set()->barrier_set_nmethod()) {
- }
+   NMethodToOopClosure(cl, true /* fix_relocations */) {}
  
  void ShenandoahNMethodAndDisarmClosure::do_nmethod(nmethod* nm) {
    assert(nm != nullptr, "Sanity");
    assert(!ShenandoahNMethod::gc_data(nm)->is_unregistered(), "Should not be here");
    NMethodToOopClosure::do_nmethod(nm);
-   _bs->disarm(nm);
+   ShenandoahNMethod::disarm_nmethod(nm);
  }
  
  
  //
  // ========= Update References