Mercurial > hg > graal-jvmci-8
diff src/share/vm/oops/typeArrayKlass.hpp @ 6831:d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
Summary: Capitalize these metadata types (and objArrayKlass)
Reviewed-by: stefank, twisti, kvn
author | coleenp |
---|---|
date | Sat, 29 Sep 2012 06:40:00 -0400 |
parents | da91efe96a93 |
children | 6bd680e9ea35 |
line wrap: on
line diff
--- a/src/share/vm/oops/typeArrayKlass.hpp Fri Sep 28 14:36:20 2012 -0700 +++ b/src/share/vm/oops/typeArrayKlass.hpp Sat Sep 29 06:40:00 2012 -0400 @@ -28,19 +28,19 @@ #include "classfile/classLoaderData.hpp" #include "oops/arrayKlass.hpp" -// A typeArrayKlass is the klass of a typeArray +// A TypeArrayKlass is the klass of a typeArray // It contains the type and size of the elements -class typeArrayKlass : public arrayKlass { +class TypeArrayKlass : public ArrayKlass { friend class VMStructs; private: jint _max_length; // maximum number of elements allowed in an array // Constructor - typeArrayKlass(BasicType type, Symbol* name); - static typeArrayKlass* allocate(ClassLoaderData* loader_data, BasicType type, Symbol* name, TRAPS); + TypeArrayKlass(BasicType type, Symbol* name); + static TypeArrayKlass* allocate(ClassLoaderData* loader_data, BasicType type, Symbol* name, TRAPS); public: - typeArrayKlass() {} // For dummy objects. + TypeArrayKlass() {} // For dummy objects. // instance variables jint max_length() { return _max_length; } @@ -50,10 +50,10 @@ bool oop_is_typeArray_slow() const { return true; } // klass allocation - static typeArrayKlass* create_klass(BasicType type, const char* name_str, + static TypeArrayKlass* create_klass(BasicType type, const char* name_str, TRAPS); static inline Klass* create_klass(BasicType type, int scale, TRAPS) { - typeArrayKlass* tak = create_klass(type, external_name(type), CHECK_NULL); + TypeArrayKlass* tak = create_klass(type, external_name(type), CHECK_NULL); assert(scale == (1 << tak->log2_element_size()), "scale must check out"); return tak; } @@ -90,17 +90,17 @@ public: // Casting from Klass* - static typeArrayKlass* cast(Klass* k) { - assert(k->oop_is_typeArray(), "cast to typeArrayKlass"); - return (typeArrayKlass*) k; + static TypeArrayKlass* cast(Klass* k) { + assert(k->oop_is_typeArray(), "cast to TypeArrayKlass"); + return (TypeArrayKlass*) k; } // Naming static const char* external_name(BasicType type); // Sizing - static int header_size() { return sizeof(typeArrayKlass)/HeapWordSize; } - int size() const { return arrayKlass::static_size(header_size()); } + static int header_size() { return sizeof(TypeArrayKlass)/HeapWordSize; } + int size() const { return ArrayKlass::static_size(header_size()); } // Initialization (virtual from Klass) void initialize(TRAPS);