src/share/vm/interpreter/bytecodeInterpreter.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 2778,2812 ****
        // Place exception on top of stack
        SET_STACK_OBJECT(except_oop(), 0);
        MORE_STACK(1);
        pc = METHOD->code_base() + continuation_bci;
        if (log_is_enabled(Info, exceptions)) {
!         ResourceMark rm;
!         log_info(exceptions)("Exception <%s> (" INTPTR_FORMAT ")\n"
!                              " thrown in interpreter method <%s>\n"
                               " at bci %d, continuing at %d for thread " INTPTR_FORMAT,
-                              except_oop->print_value_string(), p2i(except_oop()),
                               METHOD->print_value_string(),
                               (int)(istate->bcp() - METHOD->code_base()),
                               (int)continuation_bci, p2i(THREAD));
        }
        // for AbortVMOnException flag
        Exceptions::debug_check_abort(except_oop);
  
        // Update profiling data.
        BI_PROFILE_ALIGN_TO_CURRENT_BCI();
        goto run;
      }
      if (log_is_enabled(Info, exceptions)) {
        ResourceMark rm;
!       log_info(exceptions)("Exception <%s> (" INTPTR_FORMAT ")\n"
!                            " thrown in interpreter method <%s>\n"
                             " at bci %d, unwinding for thread " INTPTR_FORMAT,
-                            except_oop->print_value_string(), p2i(except_oop()),
                             METHOD->print_value_string(),
                             (int)(istate->bcp() - METHOD->code_base()),
                             p2i(THREAD));
      }
      // for AbortVMOnException flag
      Exceptions::debug_check_abort(except_oop);
  
      // No handler in this activation, unwind and try again
--- 2778,2812 ----
        // Place exception on top of stack
        SET_STACK_OBJECT(except_oop(), 0);
        MORE_STACK(1);
        pc = METHOD->code_base() + continuation_bci;
        if (log_is_enabled(Info, exceptions)) {
!         ResourceMark rm(thread);
!         stringStream tempst;
!         tempst.print("interpreter method <%s>\n"
                       " at bci %d, continuing at %d for thread " INTPTR_FORMAT,
                       METHOD->print_value_string(),
                       (int)(istate->bcp() - METHOD->code_base()),
                       (int)continuation_bci, p2i(THREAD));
+         Exceptions::log_exception(except_oop, tempst);
        }
        // for AbortVMOnException flag
        Exceptions::debug_check_abort(except_oop);
  
        // Update profiling data.
        BI_PROFILE_ALIGN_TO_CURRENT_BCI();
        goto run;
      }
      if (log_is_enabled(Info, exceptions)) {
        ResourceMark rm;
!       stringStream tempst;
!       tempst.print("interpreter method <%s>\n"
               " at bci %d, unwinding for thread " INTPTR_FORMAT,
               METHOD->print_value_string(),
               (int)(istate->bcp() - METHOD->code_base()),
               p2i(THREAD));
+       Exceptions::log_exception(except_oop, tempst);
      }
      // for AbortVMOnException flag
      Exceptions::debug_check_abort(except_oop);
  
      // No handler in this activation, unwind and try again