*** old/src/share/vm/runtime/vmStructs.cpp	Fri Sep  9 11:55:22 2011
--- new/src/share/vm/runtime/vmStructs.cpp	Fri Sep  9 11:55:22 2011

*** 259,268 ****
--- 259,269 ----
    nonstatic_field(instanceKlass,               _local_interfaces,                             objArrayOop)                           \
    nonstatic_field(instanceKlass,               _transitive_interfaces,                        objArrayOop)                           \
    nonstatic_field(instanceKlass,               _nof_implementors,                             int)                                   \
    nonstatic_field(instanceKlass,               _implementors[0],                              klassOop)                              \
    nonstatic_field(instanceKlass,               _fields,                                       typeArrayOop)                          \
+   nonstatic_field(instanceKlass,               _java_fields_count,                             int)                                   \
    nonstatic_field(instanceKlass,               _constants,                                    constantPoolOop)                       \
    nonstatic_field(instanceKlass,               _class_loader,                                 oop)                                   \
    nonstatic_field(instanceKlass,               _protection_domain,                            oop)                                   \
    nonstatic_field(instanceKlass,               _signers,                                      objArrayOop)                           \
    nonstatic_field(instanceKlass,               _source_file_name,                             Symbol*)                               \

*** 965,979 ****
--- 966,980 ----
                                                                                                                                       \
    /*********************************/                                                                                                \
    /* java_lang_Class fields        */                                                                                                \
    /*********************************/                                                                                                \
                                                                                                                                       \
!   static_field(java_lang_Class,                klass_offset,                                  int)                                   \
!   static_field(java_lang_Class,                resolved_constructor_offset,                   int)                                   \
!   static_field(java_lang_Class,                array_klass_offset,                            int)                                   \
!   static_field(java_lang_Class,                oop_size_offset,                               int)                                   \
!   static_field(java_lang_Class,                static_oop_field_count_offset,                 int)                                   \
!   static_field(java_lang_Class,                _klass_offset,                                 int)                                   \
!   static_field(java_lang_Class,                _resolved_constructor_offset,                  int)                                   \
!   static_field(java_lang_Class,                _array_klass_offset,                           int)                                   \
!   static_field(java_lang_Class,                _oop_size_offset,                              int)                                   \
!   static_field(java_lang_Class,                _static_oop_field_count_offset,                int)                                   \
                                                                                                                                       \
    /************************/                                                                                                         \
    /* Miscellaneous fields */                                                                                                         \
    /************************/                                                                                                         \
                                                                                                                                       \

*** 1660,1682 ****
--- 1661,1688 ----
    declare_constant(constMethodOopDesc::_has_linenumber_table)             \
    declare_constant(constMethodOopDesc::_has_checked_exceptions)           \
    declare_constant(constMethodOopDesc::_has_localvariable_table)          \
                                                                            \
    /*************************************/                                 \
!   /* instanceKlass FieldOffset enum    */                                 \
!   /* instanceKlass enum                */                                 \
    /*************************************/                                 \
                                                                            \
    declare_constant(instanceKlass::access_flags_offset)                    \
    declare_constant(instanceKlass::name_index_offset)                      \
    declare_constant(instanceKlass::signature_index_offset)                 \
    declare_constant(instanceKlass::initval_index_offset)                   \
    declare_constant(instanceKlass::low_offset)                             \
    declare_constant(instanceKlass::high_offset)                            \
    declare_constant(instanceKlass::generic_signature_offset)               \
    declare_constant(instanceKlass::next_offset)                            \
    declare_constant(instanceKlass::implementors_limit)                     \
                                                                            \
+   /*************************************/                                 \
+   /* FieldInfo FieldOffset enum        */                                 \
+   /*************************************/                                 \
+                                                                           \
+   declare_constant(FieldInfo::access_flags_offset)                        \
+   declare_constant(FieldInfo::name_index_offset)                          \
+   declare_constant(FieldInfo::signature_index_offset)                     \
+   declare_constant(FieldInfo::initval_index_offset)                       \
+   declare_constant(FieldInfo::low_offset)                                 \
+   declare_constant(FieldInfo::high_offset)                                \
+   declare_constant(FieldInfo::generic_signature_offset)                   \
+   declare_constant(FieldInfo::field_slots)                                \
+                                                                           \
    /************************************************/                      \
    /* instanceKlass InnerClassAttributeOffset enum */                      \
    /************************************************/                      \
                                                                            \
    declare_constant(instanceKlass::inner_class_inner_class_info_offset)    \