src/share/vm/utilities/debug.cpp

*** 227,241 ****
  {
    report_vm_error(file, line, "fatal error", message);
  }
  
  void report_vm_out_of_memory(const char* file, int line, size_t size,
!                              const char* message) {
    if (Debugging) return;
  
    Thread* thread = ThreadLocalStorage::get_thread_slow();
!   VMError(thread, file, line, size, message).report_and_die();
  
    // The UseOSErrorReporting option in report_and_die() may allow a return
    // to here. If so then we'll have to figure out how to handle it.
    guarantee(false, "report_and_die() should not return here");
  }
--- 227,241 ----
  {
    report_vm_error(file, line, "fatal error", message);
  }
  
  void report_vm_out_of_memory(const char* file, int line, size_t size,
!                              VMErrorType vm_err_type, const char* message) {
    if (Debugging) return;
  
    Thread* thread = ThreadLocalStorage::get_thread_slow();
!   VMError(thread, file, line, size, vm_err_type, message).report_and_die();
  
    // The UseOSErrorReporting option in report_and_die() may allow a return
    // to here. If so then we'll have to figure out how to handle it.
    guarantee(false, "report_and_die() should not return here");
  }
*** 342,352 ****
                             "%s%s#    %s%s#    %s%s#    %s%s#    %s%s#    "
                             "%s%s#    %s%s#    %s%s#    %s%s#    %s",
                             msg, eol, msg, eol, msg, eol, msg, eol, msg, eol,
                             msg, eol, msg, eol, msg, eol, msg, eol, msg, eol,
                             msg, eol, msg, eol, msg, eol, msg, eol, msg));
!     case  8: vm_exit_out_of_memory(num, "ChunkPool::allocate");
      case  9: ShouldNotCallThis();
      case 10: ShouldNotReachHere();
      case 11: Unimplemented();
      // This is last because it does not generate an hs_err* file on Windows.
      case 12: os::signal_raise(SIGSEGV);
--- 342,352 ----
                             "%s%s#    %s%s#    %s%s#    %s%s#    %s%s#    "
                             "%s%s#    %s%s#    %s%s#    %s%s#    %s",
                             msg, eol, msg, eol, msg, eol, msg, eol, msg, eol,
                             msg, eol, msg, eol, msg, eol, msg, eol, msg, eol,
                             msg, eol, msg, eol, msg, eol, msg, eol, msg));
!     case  8: vm_exit_out_of_memory(num, OOM_MALLOC_ERROR, "ChunkPool::allocate");
      case  9: ShouldNotCallThis();
      case 10: ShouldNotReachHere();
      case 11: Unimplemented();
      // This is last because it does not generate an hs_err* file on Windows.
      case 12: os::signal_raise(SIGSEGV);