src/hotspot/share/utilities/vmError.cpp

@@ -1402,10 +1402,11 @@
       // WatcherThread can kill JVM if the error handler hangs.
       ShowMessageBoxOnError = false;
     }
 
     os::check_dump_limit(buffer, sizeof(buffer));
+    JFR_ONLY(Jfr::setup_emergency_dump_file_descriptor();)
 
     // reset signal handlers or exception filter; make sure recursive crashes
     // are handled properly.
     reset_signal_handlers();
 

@@ -1413,12 +1414,10 @@
     if (e.should_commit()) {
       e.set_reason("VM Error");
       e.commit();
     }
 
-    JFR_ONLY(Jfr::on_vm_shutdown(true);)
-
   } else {
     // If UseOsErrorReporting we call this for each level of the call stack
     // while searching for the exception handler.  Only the first level needs
     // to be reported.
     if (UseOSErrorReporting && log_done) return;

@@ -1536,10 +1535,12 @@
     }
 
     log.set_fd(-1);
   }
 
+  JFR_ONLY(Jfr::on_vm_shutdown(true);)
+
   if (PrintNMTStatistics) {
     fdStream fds(fd_out);
     MemTracker::final_report(&fds);
   }