Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/frame.cpp @ 11065:cedf20e2a655
Merge
author | coleenp |
---|---|
date | Tue, 02 Jul 2013 16:54:24 +0200 |
parents | e0c9a1d29eb4 |
children | e619a2766bcc 583211d4b16b |
line wrap: on
line diff
--- a/src/share/vm/runtime/frame.cpp Tue Jul 02 08:42:37 2013 -0400 +++ b/src/share/vm/runtime/frame.cpp Tue Jul 02 16:54:24 2013 +0200 @@ -387,7 +387,6 @@ Method* frame::interpreter_frame_method() const { assert(is_interpreted_frame(), "interpreted frame expected"); Method* m = *interpreter_frame_method_addr(); - assert(m->is_metadata(), "bad Method* in interpreter frame"); assert(m->is_method(), "not a Method*"); return m; } @@ -713,7 +712,8 @@ Method* m = ((nmethod *)_cb)->method(); if (m != NULL) { m->name_and_sig_as_C_string(buf, buflen); - st->print("J %s", buf); + st->print("J %s @ " PTR_FORMAT " [" PTR_FORMAT "+" SIZE_FORMAT "]", + buf, _pc, _cb->code_begin(), _pc - _cb->code_begin()); } else { st->print("J " PTR_FORMAT, pc()); }