1.1 --- a/src/share/vm/oops/instanceKlass.cpp Fri Sep 28 14:36:20 2012 -0700
1.2 +++ b/src/share/vm/oops/instanceKlass.cpp Sat Sep 29 06:40:00 2012 -0400
1.3 @@ -989,13 +989,13 @@
1.4
1.5 // Check if update has already taken place
1.6 if (this_oop->array_klasses() == NULL) {
1.7 - Klass* k = objArrayKlass::allocate_objArray_klass(this_oop->class_loader_data(), 1, this_oop, CHECK_NULL);
1.8 + Klass* k = ObjArrayKlass::allocate_objArray_klass(this_oop->class_loader_data(), 1, this_oop, CHECK_NULL);
1.9 this_oop->set_array_klasses(k);
1.10 }
1.11 }
1.12 }
1.13 // _this will always be set at this point
1.14 - objArrayKlass* oak = (objArrayKlass*)this_oop->array_klasses();
1.15 + ObjArrayKlass* oak = (ObjArrayKlass*)this_oop->array_klasses();
1.16 if (or_null) {
1.17 return oak->array_klass_or_null(n);
1.18 }
1.19 @@ -1224,12 +1224,12 @@
1.20
1.21 void InstanceKlass::array_klasses_do(void f(Klass* k, TRAPS), TRAPS) {
1.22 if (array_klasses() != NULL)
1.23 - arrayKlass::cast(array_klasses())->array_klasses_do(f, THREAD);
1.24 + ArrayKlass::cast(array_klasses())->array_klasses_do(f, THREAD);
1.25 }
1.26
1.27 void InstanceKlass::array_klasses_do(void f(Klass* k)) {
1.28 if (array_klasses() != NULL)
1.29 - arrayKlass::cast(array_klasses())->array_klasses_do(f);
1.30 + ArrayKlass::cast(array_klasses())->array_klasses_do(f);
1.31 }
1.32
1.33
1.34 @@ -2310,7 +2310,7 @@
1.35 Symbol* classname1 = Klass::cast(class1)->name();
1.36
1.37 if (Klass::cast(class2)->oop_is_objArray()) {
1.38 - class2 = objArrayKlass::cast(class2)->bottom_klass();
1.39 + class2 = ObjArrayKlass::cast(class2)->bottom_klass();
1.40 }
1.41 oop classloader2;
1.42 if (Klass::cast(class2)->oop_is_instance()) {
