src/share/vm/code/codeCache.cpp

*** 72,87 ****
    void add(CodeBlob* cb) {
      count++;
      total_size       += cb->size();
      header_size      += cb->header_size();
      relocation_size  += cb->relocation_size();
-     scopes_oop_size  += cb->oops_size();
      if (cb->is_nmethod()) {
!       nmethod *nm = (nmethod*)cb;
        code_size        += nm->code_size();
        stub_size        += nm->stub_size();
  
        scopes_data_size += nm->scopes_data_size();
        scopes_pcs_size  += nm->scopes_pcs_size();
      } else {
        code_size        += cb->instructions_size();
      }
--- 72,87 ----
    void add(CodeBlob* cb) {
      count++;
      total_size       += cb->size();
      header_size      += cb->header_size();
      relocation_size  += cb->relocation_size();
      if (cb->is_nmethod()) {
!       nmethod* nm = cb->as_nmethod_or_null();
        code_size        += nm->code_size();
        stub_size        += nm->stub_size();
  
+       scopes_oop_size  += nm->oops_size();
        scopes_data_size += nm->scopes_data_size();
        scopes_pcs_size  += nm->scopes_pcs_size();
      } else {
        code_size        += cb->instructions_size();
      }
*** 489,501 ****
        nmethod *nm = (nmethod*)cb;
        assert(!nm->is_unloaded(), "Tautology");
        if (needs_cache_clean()) {
          nm->cleanup_inline_caches();
        }
!       debug_only(nm->verify();)
      }
-     cb->fix_oop_relocations();
    }
    set_needs_cache_clean(false);
    prune_scavenge_root_nmethods();
    assert(!nmethod::oops_do_marking_is_active(), "oops_do_marking_prologue must be called");
  }
--- 489,501 ----
        nmethod *nm = (nmethod*)cb;
        assert(!nm->is_unloaded(), "Tautology");
        if (needs_cache_clean()) {
          nm->cleanup_inline_caches();
        }
!       DEBUG_ONLY(nm->verify());
!       nm->fix_oop_relocations();
      }
    }
    set_needs_cache_clean(false);
    prune_scavenge_root_nmethods();
    assert(!nmethod::oops_do_marking_is_active(), "oops_do_marking_prologue must be called");
  }