*** old/src/share/vm/oops/instanceKlass.hpp	Wed Dec  7 12:03:23 2011
--- new/src/share/vm/oops/instanceKlass.hpp	Wed Dec  7 12:03:23 2011

*** 403,413 ****
--- 403,413 ----
  
    // reference type
    ReferenceType reference_type() const     { return _reference_type; }
    void set_reference_type(ReferenceType t) { _reference_type = t; }
  
!   static int reference_type_offset_in_bytes() { return sizeof(klassOopDesc) + offset_of(instanceKlass, _reference_type); }
  
    // find local field, returns true if found
    bool find_local_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const;
    // find field in direct superinterfaces, returns the interface in which the field is defined
    klassOop find_interface_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const;

*** 614,625 ****
--- 614,625 ----
    // Breakpoint support (see methods on methodOop for details)
    BreakpointInfo* breakpoints() const       { return _breakpoints; };
    void set_breakpoints(BreakpointInfo* bps) { _breakpoints = bps; };
  
    // support for stub routines
!   static int init_state_offset_in_bytes()    { return offset_of(instanceKlass, _init_state); }
!   static int init_thread_offset_in_bytes()   { return offset_of(instanceKlass, _init_thread); }
!   static int init_state_offset_in_bytes()  { return sizeof(klassOopDesc) + offset_of(instanceKlass, _init_state); }
!   static int init_thread_offset_in_bytes() { return sizeof(klassOopDesc) + offset_of(instanceKlass, _init_thread); }
  
    // subclass/subinterface checks
    bool implements_interface(klassOop k) const;
  
    // Access to implementors of an interface. We only store the count