src/hotspot/share/utilities/vmError.cpp

*** 27,37 ****
  #include "code/codeCache.hpp"
  #include "compiler/compileBroker.hpp"
  #include "compiler/disassembler.hpp"
  #include "gc/shared/gcConfig.hpp"
  #include "logging/logConfiguration.hpp"
- #include "jfr/jfrEvents.hpp"
  #include "memory/resourceArea.hpp"
  #include "memory/universe.hpp"
  #include "oops/compressedOops.hpp"
  #include "prims/whitebox.hpp"
  #include "runtime/arguments.hpp"
--- 27,36 ----
*** 618,627 ****
--- 617,629 ----
        st->print("CreateCoredumpOnCrash turned off, no core file dumped");
      }
      st->cr();
      st->print_cr("#");
  
+   JFR_ONLY(STEP("printing jfr information"))
+   JFR_ONLY(Jfr::on_vm_error_report(st);)
+ 
    STEP("printing bug submit message")
  
       if (should_report_bug(_id) && _verbose) {
         print_bug_submit_message(st, _thread);
       }
*** 1408,1426 ****
      os::check_dump_limit(buffer, sizeof(buffer));
  
      // reset signal handlers or exception filter; make sure recursive crashes
      // are handled properly.
      reset_signal_handlers();
- 
-     EventShutdown e;
-     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;
--- 1410,1419 ----
*** 1538,1547 ****
--- 1531,1542 ----
      }
  
      log.set_fd(-1);
    }
  
+   JFR_ONLY(Jfr::on_vm_shutdown(true);)
+ 
    if (PrintNMTStatistics) {
      fdStream fds(fd_out);
      MemTracker::final_report(&fds);
    }