archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Jesper Wilhelmsson 2016-01-14 17:36:29 +01:00
commit 54d0181916
1018 changed files with 30713 additions and 7018 deletions
Download patch file Download diff file Expand all files Collapse all files

43
hotspot/src/share/vm/classfile/javaClasses.cpp
View file

@ -1493,18 +1493,6 @@ void java_lang_Throwable::clear_stacktrace(oop throwable) {
}
void java_lang_Throwable::print(oop throwable, outputStream* st) {
ResourceMark rm;
Klass* k = throwable->klass();
assert(k != NULL, "just checking");
st->print("%s", k->external_name());
oop msg = message(throwable);
if (msg != NULL) {
st->print(": %s", java_lang_String::as_utf8_string(msg));
}
}
void java_lang_Throwable::print(Handle throwable, outputStream* st) {
ResourceMark rm;
Klass* k = throwable->klass();
@ -1732,20 +1720,25 @@ const char* java_lang_Throwable::no_stack_trace_message() {
return "\t<<no stack trace available>>";
}
/**
* Print the throwable message and its stack trace plus all causes by walking the
* cause chain. The output looks the same as of Throwable.printStackTrace().
*/
void java_lang_Throwable::print_stack_trace(Handle throwable, outputStream* st) {
// First, print the message.
print(throwable, st);
st->cr();
// Currently used only for exceptions occurring during startup
void java_lang_Throwable::print_stack_trace(oop throwable, outputStream* st) {
Thread *THREAD = Thread::current();
Handle h_throwable(THREAD, throwable);
while (h_throwable.not_null()) {
objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable())));
// Now print the stack trace.
Thread* THREAD = Thread::current();
while (throwable.not_null()) {
objArrayHandle result (THREAD, objArrayOop(backtrace(throwable())));
if (result.is_null()) {
st->print_raw_cr(no_stack_trace_message());
return;
}
while (result.not_null()) {
// Get method id, bci, version and mirror from chunk
typeArrayHandle methods (THREAD, BacktraceBuilder::get_methods(result));
typeArrayHandle bcis (THREAD, BacktraceBuilder::get_bcis(result));
@ -1770,20 +1763,20 @@ void java_lang_Throwable::print_stack_trace(oop throwable, outputStream* st) {
EXCEPTION_MARK;
JavaValue cause(T_OBJECT);
JavaCalls::call_virtual(&cause,
h_throwable,
KlassHandle(THREAD, h_throwable->klass()),
throwable,
KlassHandle(THREAD, throwable->klass()),
vmSymbols::getCause_name(),
vmSymbols::void_throwable_signature(),
THREAD);
// Ignore any exceptions. we are in the middle of exception handling. Same as classic VM.
if (HAS_PENDING_EXCEPTION) {
CLEAR_PENDING_EXCEPTION;
h_throwable = Handle();
throwable = Handle();
} else {
h_throwable = Handle(THREAD, (oop) cause.get_jobject());
if (h_throwable.not_null()) {
throwable = Handle(THREAD, (oop) cause.get_jobject());
if (throwable.not_null()) {
st->print("Caused by: ");
print(h_throwable, st);
print(throwable, st);
st->cr();
}
}