1.1 --- a/src/share/vm/oops/instanceKlass.hpp Fri Jan 06 16:18:29 2012 -0800 1.2 +++ b/src/share/vm/oops/instanceKlass.hpp Fri Jan 06 20:09:20 2012 -0800 1.3 @@ -433,7 +433,7 @@ 1.4 ReferenceType reference_type() const { return _reference_type; } 1.5 void set_reference_type(ReferenceType t) { _reference_type = t; } 1.6 1.7 - static int reference_type_offset_in_bytes() { return offset_of(instanceKlass, _reference_type); } 1.8 + static ByteSize reference_type_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(instanceKlass, _reference_type)); } 1.9 1.10 // find local field, returns true if found 1.11 bool find_local_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const; 1.12 @@ -644,8 +644,8 @@ 1.13 void set_breakpoints(BreakpointInfo* bps) { _breakpoints = bps; }; 1.14 1.15 // support for stub routines 1.16 - static int init_state_offset_in_bytes() { return offset_of(instanceKlass, _init_state); } 1.17 - static int init_thread_offset_in_bytes() { return offset_of(instanceKlass, _init_thread); } 1.18 + static ByteSize init_state_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(instanceKlass, _init_state)); } 1.19 + static ByteSize init_thread_offset() { return in_ByteSize(sizeof(klassOopDesc) + offset_of(instanceKlass, _init_thread)); } 1.20 1.21 // subclass/subinterface checks 1.22 bool implements_interface(klassOop k) const;