archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Christian Thalinger 2016-01-11 17:11:57 -08:00
commit a0861106e3
1535 changed files with 3601 additions and 18634 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hotspot/src/share/vm/c1/c1_Runtime1.cpp
View file

@ -43,6 +43,7 @@
#include "gc/shared/collectedHeap.hpp"
#include "interpreter/bytecode.hpp"
#include "interpreter/interpreter.hpp"
#include "logging/log.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/oopFactory.hpp"
#include "memory/resourceArea.hpp"
@ -551,11 +552,14 @@ JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* t
// debugging support
// tracing
if (TraceExceptions) {
ttyLocker ttyl;
if (log_is_enabled(Info, exceptions)) {
ResourceMark rm;
tty->print_cr("Exception <%s> (" INTPTR_FORMAT ") thrown in compiled method <%s> at PC " INTPTR_FORMAT " for thread " INTPTR_FORMAT "",
exception->print_value_string(), p2i((address)exception()), nm->method()->print_value_string(), p2i(pc), p2i(thread));
log_info(exceptions)("Exception <%s> (" INTPTR_FORMAT
") thrown in compiled method <%s> at PC " INTPTR_FORMAT
" for thread " INTPTR_FORMAT,
exception->print_value_string(),
p2i((address)exception()),
nm->method()->print_value_string(), p2i(pc), p2i(thread));
}
// for AbortVMOnException flag
Exceptions::debug_check_abort(exception);
@ -586,11 +590,11 @@ JRT_ENTRY_NO_ASYNC(static address, exception_handler_for_pc_helper(JavaThread* t
// Set flag if return address is a method handle call site.
thread->set_is_method_handle_return(nm->is_method_handle_return(pc));
if (TraceExceptions) {
ttyLocker ttyl;
if (log_is_enabled(Info, exceptions)) {
ResourceMark rm;
tty->print_cr("Thread " PTR_FORMAT " continuing at PC " PTR_FORMAT " for exception thrown at PC " PTR_FORMAT,
p2i(thread), p2i(continuation), p2i(pc));
log_info(exceptions)("Thread " PTR_FORMAT " continuing at PC " PTR_FORMAT
" for exception thrown at PC " PTR_FORMAT,
p2i(thread), p2i(continuation), p2i(pc));
}
return continuation;