*** old/src/share/vm/code/nmethod.hpp	Mon Nov 23 21:11:21 2015
--- new/src/share/vm/code/nmethod.hpp	Mon Nov 23 21:11:21 2015

*** 390,399 ****
--- 390,402 ----
    int scopes_pcs_size   () const                  { return (intptr_t) scopes_pcs_end   () - (intptr_t) scopes_pcs_begin   (); }
    int dependencies_size () const                  { return            dependencies_end () -            dependencies_begin (); }
    int handler_table_size() const                  { return            handler_table_end() -            handler_table_begin(); }
    int nul_chk_table_size() const                  { return            nul_chk_table_end() -            nul_chk_table_begin(); }
  
+   int     oops_count() const { assert(oops_size() % oopSize == 0, "");  return (oops_size() / oopSize) + 1; }
+   int metadata_count() const { assert(metadata_size() % wordSize == 0, ""); return (metadata_size() / wordSize) + 1; }
+ 
    int total_size        () const;
  
    void dec_hotness_counter()        { _hotness_counter--; }
    void set_hotness_counter(int val) { _hotness_counter = val; }
    int  hotness_counter() const      { return _hotness_counter; }

*** 489,515 ****
--- 492,520 ----
    // Support for oops in scopes and relocs:
    // Note: index 0 is reserved for null.
    oop   oop_at(int index) const                   { return index == 0 ? (oop) NULL: *oop_addr_at(index); }
    oop*  oop_addr_at(int index) const {  // for GC
      // relocation indexes are biased by 1 (because 0 is reserved)
!     assert(index > 0 && index <= oops_size(), "must be a valid non-zero index");
!     assert(index > 0 && index <= oops_count(), "must be a valid non-zero index");
      assert(!_oops_are_stale, "oops are stale");
      return &oops_begin()[index - 1];
    }
  
    // Support for meta data in scopes and relocs:
    // Note: index 0 is reserved for null.
    Metadata*     metadata_at(int index) const      { return index == 0 ? NULL: *metadata_addr_at(index); }
    Metadata**  metadata_addr_at(int index) const {  // for GC
      // relocation indexes are biased by 1 (because 0 is reserved)
!     assert(index > 0 && index <= metadata_size(), "must be a valid non-zero index");
!     assert(index > 0 && index <= metadata_count(), "must be a valid non-zero index");
      return &metadata_begin()[index - 1];
    }
  
    void copy_values(GrowableArray<jobject>* oops);
    void copy_values(GrowableArray<Metadata*>* metadata);
  
+   Method* attached_method(address call_pc);
+ 
    // Relocation support
  private:
    void fix_oop_relocations(address begin, address end, bool initialize_immediates);
    inline void initialize_immediate_oop(oop* dest, jobject handle);
  

*** 694,703 ****
--- 699,710 ----
    void print_dependencies()                       PRODUCT_RETURN;
    void print_value_on(outputStream* st) const     PRODUCT_RETURN;
    void print_calls(outputStream* st)              PRODUCT_RETURN;
    void print_handler_table()                      PRODUCT_RETURN;
    void print_nul_chk_table()                      PRODUCT_RETURN;
+   void print_recorded_oops()                      PRODUCT_RETURN;
+   void print_recorded_metadata()                  PRODUCT_RETURN;
    void print_nmethod(bool print_code);
  
    // need to re-define this from CodeBlob else the overload hides it
    virtual void print_on(outputStream* st) const { CodeBlob::print_on(st); }
    void print_on(outputStream* st, const char* msg) const;