1.1 --- a/src/share/vm/oops/arrayKlass.cpp Fri Sep 28 14:36:20 2012 -0700
1.2 +++ b/src/share/vm/oops/arrayKlass.cpp Sat Sep 29 06:40:00 2012 -0400
1.3 @@ -36,7 +36,7 @@
1.4 #include "oops/objArrayOop.hpp"
1.5 #include "oops/oop.inline.hpp"
1.6
1.7 -int arrayKlass::static_size(int header_size) {
1.8 +int ArrayKlass::static_size(int header_size) {
1.9 // size of an array klass object
1.10 assert(header_size <= InstanceKlass::header_size(), "bad header size");
1.11 // If this assert fails, see comments in base_create_array_klass.
1.12 @@ -51,7 +51,7 @@
1.13 }
1.14
1.15
1.16 -Klass* arrayKlass::java_super() const {
1.17 +Klass* ArrayKlass::java_super() const {
1.18 if (super() == NULL) return NULL; // bootstrap case
1.19 // Array klasses have primary supertypes which are not reported to Java.
1.20 // Example super chain: String[][] -> Object[][] -> Object[] -> Object
1.21 @@ -59,18 +59,18 @@
1.22 }
1.23
1.24
1.25 -oop arrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) {
1.26 +oop ArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) {
1.27 ShouldNotReachHere();
1.28 return NULL;
1.29 }
1.30
1.31 -Method* arrayKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const {
1.32 +Method* ArrayKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const {
1.33 // There are no methods in an array klass but the super class (Object) has some
1.34 assert(super(), "super klass must be present");
1.35 return Klass::cast(super())->uncached_lookup_method(name, signature);
1.36 }
1.37
1.38 -arrayKlass::arrayKlass(Symbol* name) {
1.39 +ArrayKlass::ArrayKlass(Symbol* name) {
1.40 set_alloc_size(0);
1.41 set_name(name);
1.42
1.43 @@ -89,15 +89,15 @@
1.44
1.45
1.46 // Initialization of vtables and mirror object is done separatly from base_create_array_klass,
1.47 -// since a GC can happen. At this point all instance variables of the arrayKlass must be setup.
1.48 -void arrayKlass::complete_create_array_klass(arrayKlass* k, KlassHandle super_klass, TRAPS) {
1.49 +// since a GC can happen. At this point all instance variables of the ArrayKlass must be setup.
1.50 +void ArrayKlass::complete_create_array_klass(ArrayKlass* k, KlassHandle super_klass, TRAPS) {
1.51 ResourceMark rm(THREAD);
1.52 k->initialize_supers(super_klass(), CHECK);
1.53 k->vtable()->initialize_vtable(false, CHECK);
1.54 java_lang_Class::create_mirror(k, CHECK);
1.55 }
1.56
1.57 -GrowableArray<Klass*>* arrayKlass::compute_secondary_supers(int num_extra_slots) {
1.58 +GrowableArray<Klass*>* ArrayKlass::compute_secondary_supers(int num_extra_slots) {
1.59 // interfaces = { cloneable_klass, serializable_klass };
1.60 assert(num_extra_slots == 0, "sanity of primitive array type");
1.61 // Must share this for correct bootstrapping!
1.62 @@ -105,7 +105,7 @@
1.63 return NULL;
1.64 }
1.65
1.66 -bool arrayKlass::compute_is_subtype_of(Klass* k) {
1.67 +bool ArrayKlass::compute_is_subtype_of(Klass* k) {
1.68 // An array is a subtype of Serializable, Clonable, and Object
1.69 return k == SystemDictionary::Object_klass()
1.70 || k == SystemDictionary::Cloneable_klass()
1.71 @@ -113,19 +113,19 @@
1.72 }
1.73
1.74
1.75 -inline intptr_t* arrayKlass::start_of_vtable() const {
1.76 +inline intptr_t* ArrayKlass::start_of_vtable() const {
1.77 // all vtables start at the same place, that's why we use InstanceKlass::header_size here
1.78 return ((intptr_t*)this) + InstanceKlass::header_size();
1.79 }
1.80
1.81
1.82 -klassVtable* arrayKlass::vtable() const {
1.83 +klassVtable* ArrayKlass::vtable() const {
1.84 KlassHandle kh(Thread::current(), this);
1.85 return new klassVtable(kh, start_of_vtable(), vtable_length() / vtableEntry::size());
1.86 }
1.87
1.88
1.89 -objArrayOop arrayKlass::allocate_arrayArray(int n, int length, TRAPS) {
1.90 +objArrayOop ArrayKlass::allocate_arrayArray(int n, int length, TRAPS) {
1.91 if (length < 0) {
1.92 THROW_0(vmSymbols::java_lang_NegativeArraySizeException());
1.93 }
1.94 @@ -136,40 +136,40 @@
1.95 }
1.96 int size = objArrayOopDesc::object_size(length);
1.97 Klass* k = array_klass(n+dimension(), CHECK_0);
1.98 - arrayKlass* ak = arrayKlass::cast(k);
1.99 + ArrayKlass* ak = ArrayKlass::cast(k);
1.100 objArrayOop o =
1.101 (objArrayOop)CollectedHeap::array_allocate(ak, size, length, CHECK_0);
1.102 // initialization to NULL not necessary, area already cleared
1.103 return o;
1.104 }
1.105
1.106 -void arrayKlass::array_klasses_do(void f(Klass* k, TRAPS), TRAPS) {
1.107 +void ArrayKlass::array_klasses_do(void f(Klass* k, TRAPS), TRAPS) {
1.108 Klass* k = this;
1.109 // Iterate over this array klass and all higher dimensions
1.110 while (k != NULL) {
1.111 f(k, CHECK);
1.112 - k = arrayKlass::cast(k)->higher_dimension();
1.113 + k = ArrayKlass::cast(k)->higher_dimension();
1.114 }
1.115 }
1.116
1.117 -void arrayKlass::array_klasses_do(void f(Klass* k)) {
1.118 +void ArrayKlass::array_klasses_do(void f(Klass* k)) {
1.119 Klass* k = this;
1.120 // Iterate over this array klass and all higher dimensions
1.121 while (k != NULL) {
1.122 f(k);
1.123 - k = arrayKlass::cast(k)->higher_dimension();
1.124 + k = ArrayKlass::cast(k)->higher_dimension();
1.125 }
1.126 }
1.127
1.128
1.129 -void arrayKlass::with_array_klasses_do(void f(Klass* k)) {
1.130 +void ArrayKlass::with_array_klasses_do(void f(Klass* k)) {
1.131 array_klasses_do(f);
1.132 }
1.133
1.134
1.135 // GC support
1.136
1.137 -void arrayKlass::oops_do(OopClosure* cl) {
1.138 +void ArrayKlass::oops_do(OopClosure* cl) {
1.139 Klass::oops_do(cl);
1.140
1.141 cl->do_oop(adr_component_mirror());
1.142 @@ -177,42 +177,42 @@
1.143
1.144 // JVM support
1.145
1.146 -jint arrayKlass::compute_modifier_flags(TRAPS) const {
1.147 +jint ArrayKlass::compute_modifier_flags(TRAPS) const {
1.148 return JVM_ACC_ABSTRACT | JVM_ACC_FINAL | JVM_ACC_PUBLIC;
1.149 }
1.150
1.151 // JVMTI support
1.152
1.153 -jint arrayKlass::jvmti_class_status() const {
1.154 +jint ArrayKlass::jvmti_class_status() const {
1.155 return JVMTI_CLASS_STATUS_ARRAY;
1.156 }
1.157
1.158 -void arrayKlass::remove_unshareable_info() {
1.159 +void ArrayKlass::remove_unshareable_info() {
1.160 Klass::remove_unshareable_info();
1.161 // Clear the java mirror
1.162 set_component_mirror(NULL);
1.163 }
1.164
1.165 -void arrayKlass::restore_unshareable_info(TRAPS) {
1.166 +void ArrayKlass::restore_unshareable_info(TRAPS) {
1.167 Klass::restore_unshareable_info(CHECK);
1.168 // Klass recreates the component mirror also
1.169 }
1.170
1.171 // Printing
1.172
1.173 -void arrayKlass::print_on(outputStream* st) const {
1.174 +void ArrayKlass::print_on(outputStream* st) const {
1.175 assert(is_klass(), "must be klass");
1.176 Klass::print_on(st);
1.177 }
1.178
1.179 -void arrayKlass::print_value_on(outputStream* st) const {
1.180 +void ArrayKlass::print_value_on(outputStream* st) const {
1.181 assert(is_klass(), "must be klass");
1.182 for(int index = 0; index < dimension(); index++) {
1.183 st->print("[]");
1.184 }
1.185 }
1.186
1.187 -void arrayKlass::oop_print_on(oop obj, outputStream* st) {
1.188 +void ArrayKlass::oop_print_on(oop obj, outputStream* st) {
1.189 assert(obj->is_array(), "must be array");
1.190 Klass::oop_print_on(obj, st);
1.191 st->print_cr(" - length: %d", arrayOop(obj)->length());
1.192 @@ -221,7 +221,7 @@
1.193
1.194 // Verification
1.195
1.196 -void arrayKlass::verify_on(outputStream* st) {
1.197 +void ArrayKlass::verify_on(outputStream* st) {
1.198 Klass::verify_on(st);
1.199
1.200 if (component_mirror() != NULL) {
1.201 @@ -229,7 +229,7 @@
1.202 }
1.203 }
1.204
1.205 -void arrayKlass::oop_verify_on(oop obj, outputStream* st) {
1.206 +void ArrayKlass::oop_verify_on(oop obj, outputStream* st) {
1.207 guarantee(obj->is_array(), "must be array");
1.208 arrayOop a = arrayOop(obj);
1.209 guarantee(a->length() >= 0, "array with negative length?");
