diff src/share/vm/runtime/frame.cpp @ 14396:583211d4b16b

Merge
author kvn
date Wed, 03 Jul 2013 11:50:29 -0700
parents b5c8a61d7fa0 e0c9a1d29eb4
children 94c202aa2646
line wrap: on
line diff
--- a/src/share/vm/runtime/frame.cpp	Wed Jun 26 16:06:38 2013 +0200
+++ b/src/share/vm/runtime/frame.cpp	Wed Jul 03 11:50:29 2013 -0700
@@ -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());
       }