1.1 --- a/src/share/vm/oops/objArrayKlass.hpp Fri Sep 28 14:36:20 2012 -0700
1.2 +++ b/src/share/vm/oops/objArrayKlass.hpp Sat Sep 29 06:40:00 2012 -0400
1.3 @@ -29,20 +29,20 @@
1.4 #include "memory/specialized_oop_closures.hpp"
1.5 #include "oops/arrayKlass.hpp"
1.6
1.7 -// objArrayKlass is the klass for objArrays
1.8 +// ObjArrayKlass is the klass for objArrays
1.9
1.10 -class objArrayKlass : public arrayKlass {
1.11 +class ObjArrayKlass : public ArrayKlass {
1.12 friend class VMStructs;
1.13 private:
1.14 Klass* _element_klass; // The klass of the elements of this array type
1.15 - Klass* _bottom_klass; // The one-dimensional type (InstanceKlass or typeArrayKlass)
1.16 + Klass* _bottom_klass; // The one-dimensional type (InstanceKlass or TypeArrayKlass)
1.17
1.18 // Constructor
1.19 - objArrayKlass(int n, KlassHandle element_klass, Symbol* name);
1.20 - static objArrayKlass* allocate(ClassLoaderData* loader_data, int n, KlassHandle klass_handle, Symbol* name, TRAPS);
1.21 + ObjArrayKlass(int n, KlassHandle element_klass, Symbol* name);
1.22 + static ObjArrayKlass* allocate(ClassLoaderData* loader_data, int n, KlassHandle klass_handle, Symbol* name, TRAPS);
1.23 public:
1.24 // For dummy objects
1.25 - objArrayKlass() {}
1.26 + ObjArrayKlass() {}
1.27
1.28 // Instance variables
1.29 Klass* element_klass() const { return _element_klass; }
1.30 @@ -54,7 +54,7 @@
1.31 Klass** bottom_klass_addr() { return &_bottom_klass; }
1.32
1.33 // Compiler/Interpreter offset
1.34 - static ByteSize element_klass_offset() { return in_ByteSize(offset_of(objArrayKlass, _element_klass)); }
1.35 + static ByteSize element_klass_offset() { return in_ByteSize(offset_of(ObjArrayKlass, _element_klass)); }
1.36
1.37 // Dispatched operation
1.38 bool can_be_primary_super_slow() const;
1.39 @@ -78,11 +78,11 @@
1.40
1.41 private:
1.42 // Either oop or narrowOop depending on UseCompressedOops.
1.43 - // must be called from within objArrayKlass.cpp
1.44 + // must be called from within ObjArrayKlass.cpp
1.45 template <class T> void do_copy(arrayOop s, T* src, arrayOop d,
1.46 T* dst, int length, TRAPS);
1.47 protected:
1.48 - // Returns the objArrayKlass for n'th dimension.
1.49 + // Returns the ObjArrayKlass for n'th dimension.
1.50 virtual Klass* array_klass_impl(bool or_null, int n, TRAPS);
1.51
1.52 // Returns the array class with this class as element type.
1.53 @@ -90,14 +90,14 @@
1.54
1.55 public:
1.56 // Casting from Klass*
1.57 - static objArrayKlass* cast(Klass* k) {
1.58 - assert(k->oop_is_objArray(), "cast to objArrayKlass");
1.59 - return (objArrayKlass*) k;
1.60 + static ObjArrayKlass* cast(Klass* k) {
1.61 + assert(k->oop_is_objArray(), "cast to ObjArrayKlass");
1.62 + return (ObjArrayKlass*) k;
1.63 }
1.64
1.65 // Sizing
1.66 - static int header_size() { return sizeof(objArrayKlass)/HeapWordSize; }
1.67 - int size() const { return arrayKlass::static_size(header_size()); }
1.68 + static int header_size() { return sizeof(ObjArrayKlass)/HeapWordSize; }
1.69 + int size() const { return ArrayKlass::static_size(header_size()); }
1.70
1.71 // Initialization (virtual from Klass)
1.72 void initialize(TRAPS);
