--- old/src/hotspot/share/gc/z/zRelocate.cpp	2019-12-09 22:12:12.166569769 +0100
+++ new/src/hotspot/share/gc/z/zRelocate.cpp	2019-12-09 22:12:11.966566610 +0100
@@ -56,6 +56,10 @@
     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);
   }
@@ -73,7 +77,7 @@
 public:
   ZRelocateRootsTask() :
       ZTask("ZRelocateRootsTask"),
-      _roots(true /* visit_jvmti_weak_export */, true /* disarm_nmethods */) {}
+      _roots(true /* visit_jvmti_weak_export */) {}
 
   virtual void work() {
     // During relocation we need to visit the JVMTI