*** old/src/share/vm/oops/method.cpp	Wed Jul 30 19:10:36 2014
--- new/src/share/vm/oops/method.cpp	Wed Jul 30 19:10:36 2014

*** 281,290 ****
--- 281,297 ----
    address bcp = code_base() + bci;
    assert(is_native() && bcp == code_base() || contains(bcp), "bcp doesn't belong to this method");
    return bcp;
  }
  
+ address Method::bcp_from(address bcp) const {
+   if (is_native() && bcp == 0) {
+     return code_base() + (intptr_t)bcp;
+   } else {
+     return bcp;
+   }
+ }
  
  int Method::size(bool is_native) {
    // If native, then include pointers for native_function and signature_handler
    int extra_bytes = (is_native) ? 2*sizeof(address*) : 0;
    int extra_words = align_size_up(extra_bytes, BytesPerWord) / BytesPerWord;