src/share/vm/utilities/debug.cpp

*** 213,241 ****
  void report_vm_error(const char* file, int line, const char* error_msg, const char* detail_fmt, ...)
  {
    if (Debugging || error_is_suppressed(file, line)) return;
    va_list detail_args;
    va_start(detail_args, detail_fmt);
!   VMError::report_and_die(ThreadLocalStorage::get_thread_slow(), file, line, error_msg, detail_fmt, detail_args);
    va_end(detail_args);
  }
  
  void report_fatal(const char* file, int line, const char* detail_fmt, ...)
  {
    if (Debugging || error_is_suppressed(file, line)) return;
    va_list detail_args;
    va_start(detail_args, detail_fmt);
!   VMError::report_and_die(ThreadLocalStorage::get_thread_slow(), file, line, "fatal error", detail_fmt, detail_args);
    va_end(detail_args);
  }
  
  void report_vm_out_of_memory(const char* file, int line, size_t size,
                               VMErrorType vm_err_type, const char* detail_fmt, ...) {
    if (Debugging) return;
    va_list detail_args;
    va_start(detail_args, detail_fmt);
!   VMError::report_and_die(ThreadLocalStorage::get_thread_slow(), file, line, size, vm_err_type, detail_fmt, detail_args);
    va_end(detail_args);
  
    // 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");
--- 213,241 ----
  void report_vm_error(const char* file, int line, const char* error_msg, const char* detail_fmt, ...)
  {
    if (Debugging || error_is_suppressed(file, line)) return;
    va_list detail_args;
    va_start(detail_args, detail_fmt);
!   VMError::report_and_die(Thread::current_or_null(), file, line, error_msg, detail_fmt, detail_args);
    va_end(detail_args);
  }
  
  void report_fatal(const char* file, int line, const char* detail_fmt, ...)
  {
    if (Debugging || error_is_suppressed(file, line)) return;
    va_list detail_args;
    va_start(detail_args, detail_fmt);
!   VMError::report_and_die(Thread::current_or_null(), file, line, "fatal error", detail_fmt, detail_args);
    va_end(detail_args);
  }
  
  void report_vm_out_of_memory(const char* file, int line, size_t size,
                               VMErrorType vm_err_type, const char* detail_fmt, ...) {
    if (Debugging) return;
    va_list detail_args;
    va_start(detail_args, detail_fmt);
!   VMError::report_and_die(Thread::current_or_null(), file, line, size, vm_err_type, detail_fmt, detail_args);
    va_end(detail_args);
  
    // 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");
*** 532,542 ****
  extern "C" void findpc(intptr_t x);
  
  #endif // !PRODUCT
  
  extern "C" void ps() { // print stack
!   if (Thread::current() == NULL) return;
    Command c("ps");
  
  
    // Prints the stack of the current Java thread
    JavaThread* p = JavaThread::active();
--- 532,542 ----
  extern "C" void findpc(intptr_t x);
  
  #endif // !PRODUCT
  
  extern "C" void ps() { // print stack
!   if (Thread::current_or_null() == NULL) return;
    Command c("ps");
  
  
    // Prints the stack of the current Java thread
    JavaThread* p = JavaThread::active();
*** 611,621 ****
  }
  
  #endif // !PRODUCT
  
  extern "C" void pss() { // print all stacks
!   if (Thread::current() == NULL) return;
    Command c("pss");
    Threads::print(true, PRODUCT_ONLY(false) NOT_PRODUCT(true));
  }
  
  #ifndef PRODUCT
--- 611,621 ----
  }
  
  #endif // !PRODUCT
  
  extern "C" void pss() { // print all stacks
!   if (Thread::current_or_null() == NULL) return;
    Command c("pss");
    Threads::print(true, PRODUCT_ONLY(false) NOT_PRODUCT(true));
  }
  
  #ifndef PRODUCT
*** 768,778 ****
  #ifndef PRODUCT
  
  extern "C" void pns(void* sp, void* fp, void* pc) { // print native stack
    Command c("pns");
    static char buf[O_BUFLEN];
!   Thread* t = ThreadLocalStorage::get_thread_slow();
    // Call generic frame constructor (certain arguments may be ignored)
    frame fr(sp, fp, pc);
    print_native_stack(tty, fr, t, buf, sizeof(buf));
  }
  
--- 768,778 ----
  #ifndef PRODUCT
  
  extern "C" void pns(void* sp, void* fp, void* pc) { // print native stack
    Command c("pns");
    static char buf[O_BUFLEN];
!   Thread* t = Thread::current_or_null();
    // Call generic frame constructor (certain arguments may be ignored)
    frame fr(sp, fp, pc);
    print_native_stack(tty, fr, t, buf, sizeof(buf));
  }