src/hotspot/share/gc/z/zRelocate.cpp

*** 54,63 ****
--- 54,67 ----
  
      // Remap TLAB
      ZThreadLocalAllocBuffer::remap(thread);
    }
  
+   virtual bool should_disarm_nmethods() const {
+     return true;
+   }
+ 
    virtual void do_oop(oop* p) {
      ZBarrier::relocate_barrier_on_root_oop_field(p);
    }
  
    virtual void do_oop(narrowOop* p) {
*** 71,81 ****
    ZRelocateRootsIteratorClosure _cl;
  
  public:
    ZRelocateRootsTask() :
        ZTask("ZRelocateRootsTask"),
!       _roots(true /* visit_jvmti_weak_export */, true /* disarm_nmethods */) {}
  
    virtual void work() {
      // During relocation we need to visit the JVMTI
      // export weak roots to rehash the JVMTI tag map
      _roots.oops_do(&_cl);
--- 75,85 ----
    ZRelocateRootsIteratorClosure _cl;
  
  public:
    ZRelocateRootsTask() :
        ZTask("ZRelocateRootsTask"),
!       _roots(true /* visit_jvmti_weak_export */) {}
  
    virtual void work() {
      // During relocation we need to visit the JVMTI
      // export weak roots to rehash the JVMTI tag map
      _roots.oops_do(&_cl);