src/share/vm/code/nmethod.cpp

rev 12121 : [mq]: all_changes.patch

*** 706,715 ****
--- 706,716 ----
      _hotness_counter         = NMethodSweeper::hotness_counter_reset_val();
  
      // 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();
      _speculation_log = (instanceOop)speculation_log();
  
*** 2203,2212 ****
--- 2204,2214 ----
        case relocInfo::static_call_type:
          stub = iter.static_call_reloc()->static_stub();
          //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
          // information in a table.
          break;
*** 2461,2474 ****
            if (obj == NULL) st.print("NULL");
            else obj->print_value_on(&st);
            st.print(")");
            return st.as_string();
          }
!         case relocInfo::runtime_call_type: {
            stringStream st;
            st.print("runtime_call");
!           runtime_call_Relocation* r = iter.runtime_call_reloc();
            address dest = r->destination();
            CodeBlob* cb = CodeCache::find_blob(dest);
            if (cb != NULL) {
              st.print(" %s", cb->name());
            } else {
--- 2463,2477 ----
            if (obj == NULL) st.print("NULL");
            else obj->print_value_on(&st);
            st.print(")");
            return st.as_string();
          }
!         case relocInfo::runtime_call_type:
!         case relocInfo::runtime_call_w_cp_type: {
            stringStream st;
            st.print("runtime_call");
!           CallRelocation* r = (CallRelocation*)iter.reloc();
            address dest = r->destination();
            CodeBlob* cb = CodeCache::find_blob(dest);
            if (cb != NULL) {
              st.print(" %s", cb->name());
            } else {