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

*** 154,11 ***
--- 155,15 ---
  public:
    void do_thread(Thread* thread) {}
  };
  
  void ZUnload::unload() {
+   ZUnloadRendezvousClosure cl;
    if (!ClassUnloading) {
+     // Even when we don't use class unloading, we want a handshake to
+     // close the resurrection block window.
+     Handshake::execute(&cl);
      return;
    }
  
    ZStatTimer timer(ZSubPhaseConcurrentClassesUnload);
  

*** 165,11 ***
  
    // Unlink stale metadata and nmethods
    unlink();
  
    // Make sure stale metadata and nmethods are no longer observable
-   ZUnloadRendezvousClosure cl;
    Handshake::execute(&cl);
  
    // Purge stale metadata and nmethods that were unlinked
    purge();
  }
--- 169,10 ---