1.1 --- a/src/share/vm/runtime/vmStructs.cpp Fri Sep 28 14:36:20 2012 -0700
1.2 +++ b/src/share/vm/runtime/vmStructs.cpp Sat Sep 29 06:40:00 2012 -0400
1.3 @@ -268,12 +268,12 @@
1.4 volatile_nonstatic_field(oopDesc, _metadata._klass, Klass*) \
1.5 volatile_nonstatic_field(oopDesc, _metadata._compressed_klass, narrowOop) \
1.6 static_field(oopDesc, _bs, BarrierSet*) \
1.7 - nonstatic_field(arrayKlass, _dimension, int) \
1.8 - volatile_nonstatic_field(arrayKlass, _higher_dimension, Klass*) \
1.9 - volatile_nonstatic_field(arrayKlass, _lower_dimension, Klass*) \
1.10 - nonstatic_field(arrayKlass, _vtable_len, int) \
1.11 - nonstatic_field(arrayKlass, _alloc_size, juint) \
1.12 - nonstatic_field(arrayKlass, _component_mirror, oop) \
1.13 + nonstatic_field(ArrayKlass, _dimension, int) \
1.14 + volatile_nonstatic_field(ArrayKlass, _higher_dimension, Klass*) \
1.15 + volatile_nonstatic_field(ArrayKlass, _lower_dimension, Klass*) \
1.16 + nonstatic_field(ArrayKlass, _vtable_len, int) \
1.17 + nonstatic_field(ArrayKlass, _alloc_size, juint) \
1.18 + nonstatic_field(ArrayKlass, _component_mirror, oop) \
1.19 nonstatic_field(CompiledICHolder, _holder_method, Method*) \
1.20 nonstatic_field(CompiledICHolder, _holder_klass, Klass*) \
1.21 nonstatic_field(ConstantPool, _tags, Array<u1>*) \
1.22 @@ -379,13 +379,13 @@
1.23 nonstatic_field(ConstMethod, _signature_index, u2) \
1.24 nonstatic_field(ConstMethod, _method_idnum, u2) \
1.25 nonstatic_field(ConstMethod, _generic_signature_index, u2) \
1.26 - nonstatic_field(objArrayKlass, _element_klass, Klass*) \
1.27 - nonstatic_field(objArrayKlass, _bottom_klass, Klass*) \
1.28 + nonstatic_field(ObjArrayKlass, _element_klass, Klass*) \
1.29 + nonstatic_field(ObjArrayKlass, _bottom_klass, Klass*) \
1.30 volatile_nonstatic_field(Symbol, _refcount, int) \
1.31 nonstatic_field(Symbol, _identity_hash, int) \
1.32 nonstatic_field(Symbol, _length, unsigned short) \
1.33 unchecked_nonstatic_field(Symbol, _body, sizeof(jbyte)) /* NOTE: no type */ \
1.34 - nonstatic_field(typeArrayKlass, _max_length, int) \
1.35 + nonstatic_field(TypeArrayKlass, _max_length, int) \
1.36 \
1.37 /***********************/ \
1.38 /* Constant Pool Cache */ \
1.39 @@ -1370,9 +1370,9 @@
1.40 declare_toplevel_type(MetaspaceObj) \
1.41 declare_type(Metadata, MetaspaceObj) \
1.42 declare_type(Klass, Metadata) \
1.43 - declare_type(arrayKlass, Klass) \
1.44 - declare_type(objArrayKlass, arrayKlass) \
1.45 - declare_type(typeArrayKlass, arrayKlass) \
1.46 + declare_type(ArrayKlass, Klass) \
1.47 + declare_type(ObjArrayKlass, ArrayKlass) \
1.48 + declare_type(TypeArrayKlass, ArrayKlass) \
1.49 declare_type(InstanceKlass, Klass) \
1.50 declare_type(InstanceClassLoaderKlass, InstanceKlass) \
1.51 declare_type(InstanceMirrorKlass, InstanceKlass) \
