1.1 --- a/src/share/vm/oops/instanceMirrorKlass.hpp Thu Sep 06 07:28:30 2012 -0700
1.2 +++ b/src/share/vm/oops/instanceMirrorKlass.hpp Fri Sep 07 12:04:16 2012 -0400
1.3 @@ -29,7 +29,7 @@
1.4 #include "oops/instanceKlass.hpp"
1.5 #include "runtime/handles.hpp"
1.6
1.7 -// An instanceMirrorKlass is a specialized InstanceKlass for
1.8 +// An InstanceMirrorKlass is a specialized InstanceKlass for
1.9 // java.lang.Class instances. These instances are special because
1.10 // they contain the static fields of the class in addition to the
1.11 // normal fields of Class. This means they are variable sized
1.12 @@ -37,7 +37,7 @@
1.13 // iteration of their oops.
1.14
1.15
1.16 -class instanceMirrorKlass: public InstanceKlass {
1.17 +class InstanceMirrorKlass: public InstanceKlass {
1.18 friend class VMStructs;
1.19 friend class InstanceKlass;
1.20
1.21 @@ -45,18 +45,18 @@
1.22 static int _offset_of_static_fields;
1.23
1.24 // Constructor
1.25 - instanceMirrorKlass(int vtable_len, int itable_len, int static_field_size, int nonstatic_oop_map_size, ReferenceType rt, AccessFlags access_flags, bool is_anonymous)
1.26 + InstanceMirrorKlass(int vtable_len, int itable_len, int static_field_size, int nonstatic_oop_map_size, ReferenceType rt, AccessFlags access_flags, bool is_anonymous)
1.27 : InstanceKlass(vtable_len, itable_len, static_field_size, nonstatic_oop_map_size, rt, access_flags, is_anonymous) {}
1.28
1.29 public:
1.30 - instanceMirrorKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
1.31 + InstanceMirrorKlass() { assert(DumpSharedSpaces || UseSharedSpaces, "only for CDS"); }
1.32 // Type testing
1.33 bool oop_is_instanceMirror() const { return true; }
1.34
1.35 // Casting from Klass*
1.36 - static instanceMirrorKlass* cast(Klass* k) {
1.37 - assert(k->oop_is_instanceMirror(), "cast to instanceMirrorKlass");
1.38 - return (instanceMirrorKlass*) k;
1.39 + static InstanceMirrorKlass* cast(Klass* k) {
1.40 + assert(k->oop_is_instanceMirror(), "cast to InstanceMirrorKlass");
1.41 + return (InstanceMirrorKlass*) k;
1.42 }
1.43
1.44 // Returns the size of the instance including the extra static fields.
1.45 @@ -71,7 +71,7 @@
1.46 static void init_offset_of_static_fields() {
1.47 // Cache the offset of the static fields in the Class instance
1.48 assert(_offset_of_static_fields == 0, "once");
1.49 - _offset_of_static_fields = instanceMirrorKlass::cast(SystemDictionary::Class_klass())->size_helper() << LogHeapWordSize;
1.50 + _offset_of_static_fields = InstanceMirrorKlass::cast(SystemDictionary::Class_klass())->size_helper() << LogHeapWordSize;
1.51 }
1.52
1.53 static int offset_of_static_fields() {
