1.1 --- a/src/share/vm/oops/methodOop.cpp Thu Jun 14 12:21:48 2012 +0200
1.2 +++ b/src/share/vm/oops/methodOop.cpp Thu Jun 14 14:59:52 2012 -0700
1.3 @@ -70,11 +70,11 @@
1.4 return _adapter->get_c2i_unverified_entry();
1.5 }
1.6
1.7 -char* methodOopDesc::name_and_sig_as_C_string() {
1.8 +char* methodOopDesc::name_and_sig_as_C_string() const {
1.9 return name_and_sig_as_C_string(Klass::cast(constants()->pool_holder()), name(), signature());
1.10 }
1.11
1.12 -char* methodOopDesc::name_and_sig_as_C_string(char* buf, int size) {
1.13 +char* methodOopDesc::name_and_sig_as_C_string(char* buf, int size) const {
1.14 return name_and_sig_as_C_string(Klass::cast(constants()->pool_holder()), name(), signature(), buf, size);
1.15 }
1.16
1.17 @@ -177,7 +177,8 @@
1.18
1.19
1.20 int methodOopDesc::bci_from(address bcp) const {
1.21 - assert(is_native() && bcp == code_base() || contains(bcp) || is_error_reported(), "bcp doesn't belong to this method");
1.22 + assert(is_native() && bcp == code_base() || contains(bcp) || is_error_reported(),
1.23 + err_msg("bcp doesn't belong to this method: bcp: " INTPTR_FORMAT ", method: %s", bcp, name_and_sig_as_C_string()));
1.24 return bcp - code_base();
1.25 }
1.26
