Mercurial > hg > graal-jvmci-8
diff src/share/vm/oops/methodOop.cpp @ 6146:eba1d5bce9e8
Merge
author | kvn |
---|---|
date | Thu, 14 Jun 2012 14:59:52 -0700 |
parents | 2fe087c3e814 e2fe93124108 |
children | 8150fa46d2ed |
line wrap: on
line diff
--- a/src/share/vm/oops/methodOop.cpp Thu Jun 14 12:21:48 2012 +0200 +++ b/src/share/vm/oops/methodOop.cpp Thu Jun 14 14:59:52 2012 -0700 @@ -70,11 +70,11 @@ return _adapter->get_c2i_unverified_entry(); } -char* methodOopDesc::name_and_sig_as_C_string() { +char* methodOopDesc::name_and_sig_as_C_string() const { return name_and_sig_as_C_string(Klass::cast(constants()->pool_holder()), name(), signature()); } -char* methodOopDesc::name_and_sig_as_C_string(char* buf, int size) { +char* methodOopDesc::name_and_sig_as_C_string(char* buf, int size) const { return name_and_sig_as_C_string(Klass::cast(constants()->pool_holder()), name(), signature(), buf, size); } @@ -177,7 +177,8 @@ int methodOopDesc::bci_from(address bcp) const { - assert(is_native() && bcp == code_base() || contains(bcp) || is_error_reported(), "bcp doesn't belong to this method"); + assert(is_native() && bcp == code_base() || contains(bcp) || is_error_reported(), + err_msg("bcp doesn't belong to this method: bcp: " INTPTR_FORMAT ", method: %s", bcp, name_and_sig_as_C_string())); return bcp - code_base(); }