--- old/src/hotspot/share/utilities/vmError.cpp	2020-01-28 21:42:23.175254300 +0900
+++ new/src/hotspot/share/utilities/vmError.cpp	2020-01-28 21:42:22.905077700 +0900
@@ -1404,6 +1404,7 @@
     }
 
     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.
@@ -1415,8 +1416,6 @@
       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
@@ -1538,6 +1537,8 @@
     log.set_fd(-1);
   }
 
+  JFR_ONLY(Jfr::on_vm_shutdown(true);)
+
   if (PrintNMTStatistics) {
     fdStream fds(fd_out);
     MemTracker::final_report(&fds);