--- a/hotspot/src/share/vm/code/nmethod.cpp Thu Sep 22 18:29:15 2016 +0200
+++ b/hotspot/src/share/vm/code/nmethod.cpp Wed Oct 05 15:20:35 2016 +0200
@@ -682,6 +682,7 @@
// Section offsets
_consts_offset = content_offset() + code_buffer->total_offset_of(code_buffer->consts());
_stub_offset = content_offset() + code_buffer->total_offset_of(code_buffer->stubs());
+ set_ctable_begin(header_begin() + _consts_offset);
#if INCLUDE_JVMCI
_jvmci_installed_code = installed_code();
@@ -2177,6 +2178,7 @@
//verify_interrupt_point(iter.addr());
break;
case relocInfo::runtime_call_type:
+ case relocInfo::runtime_call_w_cp_type:
address destination = iter.reloc()->value();
// Right now there is no way to find out which entries support
// an interrupt point. It would be nice if we had this
@@ -2435,10 +2437,11 @@
st.print(")");
return st.as_string();
}
- case relocInfo::runtime_call_type: {
+ case relocInfo::runtime_call_type:
+ case relocInfo::runtime_call_w_cp_type: {
stringStream st;
st.print("runtime_call");
- runtime_call_Relocation* r = iter.runtime_call_reloc();
+ CallRelocation* r = (CallRelocation*)iter.reloc();
address dest = r->destination();
CodeBlob* cb = CodeCache::find_blob(dest);
if (cb != NULL) {