OpenJDK / jdk / jdk
changeset 38053:e6efb2c54538
8154145: Missing klass/method name in stack traces on error
Reviewed-by: stefank, cjplummer
| author | vlivanov |
|---|---|
| date | Wed, 20 Apr 2016 20:40:46 +0300 |
| parents | 6ab6e9bc4759 |
| children | 3a22f46fb514 9dddf9056918 |
| files | hotspot/src/share/vm/runtime/frame.cpp |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/src/share/vm/runtime/frame.cpp Tue Apr 19 19:52:39 2016 -0700 +++ b/hotspot/src/share/vm/runtime/frame.cpp Wed Apr 20 20:40:46 2016 +0300 @@ -665,10 +665,12 @@ nmethod* nm = (nmethod*)_cb; Method* m = nm->method(); if (m != NULL) { + st->print("J %d%s", nm->compile_id(), (nm->is_osr_method() ? "%" : "")); + if (nm->compiler() != NULL) { + st->print(" %s", nm->compiler()->name()); + } m->name_and_sig_as_C_string(buf, buflen); - st->print("J %d%s %s ", - nm->compile_id(), (nm->is_osr_method() ? "%" : ""), - ((nm->compiler() != NULL) ? nm->compiler()->name() : "")); + st->print(" %s", buf); ModuleEntry* module = m->method_holder()->module(); if (module->is_named()) { module->name()->as_C_string(buf, buflen); @@ -676,8 +678,8 @@ module->version()->as_C_string(buf, buflen); st->print("@%s", buf); } - st->print("%s (%d bytes) @ " PTR_FORMAT " [" PTR_FORMAT "+" INTPTR_FORMAT "]", - buf, m->code_size(), p2i(_pc), p2i(_cb->code_begin()), _pc - _cb->code_begin()); + st->print(" (%d bytes) @ " PTR_FORMAT " [" PTR_FORMAT "+" INTPTR_FORMAT "]", + m->code_size(), p2i(_pc), p2i(_cb->code_begin()), _pc - _cb->code_begin()); #if INCLUDE_JVMCI char* jvmciName = nm->jvmci_installed_code_name(buf, buflen); if (jvmciName != NULL) {