src/share/vm/runtime/vmStructs.cpp

*** 943,953 ****
--- 943,962 ----
    static_field(Arguments,                      _num_jvm_flags,                                int)                                   \
    static_field(Arguments,                      _jvm_args_array,                               char**)                                \
    static_field(Arguments,                      _num_jvm_args,                                 int)                                   \
    static_field(Arguments,                      _java_command,                                 char*)                                 \
                                                                                                                                       \
+   /*********************************/                                                                                                \
+   /* 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_size_offset,                  int)                                   \
+                                                                                                                                      \
    /************************/                                                                                                         \
    /* Miscellaneous fields */                                                                                                         \
    /************************/                                                                                                         \
                                                                                                                                       \
    nonstatic_field(AccessFlags,                 _flags,                                        jint)                                  \
*** 1412,1421 ****
--- 1421,1431 ----
    declare_toplevel_type(ConstantPoolCacheEntry)                           \
    declare_toplevel_type(elapsedTimer)                                     \
    declare_toplevel_type(intptr_t*)                                        \
     declare_unsigned_integer_type(InvocationCounter) /* FIXME: wrong type (not integer) */ \
    declare_toplevel_type(JavaThread*)                                      \
+   declare_toplevel_type(java_lang_Class)                                  \
    declare_toplevel_type(jbyte*)                                           \
    declare_toplevel_type(jbyte**)                                          \
    declare_toplevel_type(jint*)                                            \
    declare_toplevel_type(jniIdMapBase*)                                    \
    declare_unsigned_integer_type(juint)                                    \
*** 1698,1716 ****
    /* ConstantPoolCacheEntry FlagValues enum */                            \
    /******************************************/                            \
                                                                            \
    declare_constant(ConstantPoolCacheEntry::tosBits)                       \
                                                                            \
-   /*********************************/                                     \
-   /* java_lang_Class field offsets */                                     \
-   /*********************************/                                     \
-                                                                           \
-   declare_constant(java_lang_Class::hc_klass_offset)                      \
-   declare_constant(java_lang_Class::hc_array_klass_offset)                \
-   declare_constant(java_lang_Class::hc_resolved_constructor_offset)       \
-   declare_constant(java_lang_Class::hc_number_of_fake_oop_fields)         \
-                                                                           \
    /***************************************/                               \
    /* java_lang_Thread::ThreadStatus enum */                               \
    /***************************************/                               \
                                                                            \
    declare_constant(java_lang_Thread::NEW)                                 \
--- 1708,1717 ----