1.1 --- a/src/share/vm/classfile/javaClasses.cpp Fri Sep 28 14:36:20 2012 -0700
1.2 +++ b/src/share/vm/classfile/javaClasses.cpp Sat Sep 29 06:40:00 2012 -0400
1.3 @@ -540,18 +540,18 @@
1.4 if (k->oop_is_array()) {
1.5 Handle comp_mirror;
1.6 if (k->oop_is_typeArray()) {
1.7 - BasicType type = typeArrayKlass::cast(k())->element_type();
1.8 + BasicType type = TypeArrayKlass::cast(k())->element_type();
1.9 comp_mirror = Universe::java_mirror(type);
1.10 } else {
1.11 assert(k->oop_is_objArray(), "Must be");
1.12 - Klass* element_klass = objArrayKlass::cast(k())->element_klass();
1.13 + Klass* element_klass = ObjArrayKlass::cast(k())->element_klass();
1.14 assert(element_klass != NULL, "Must have an element klass");
1.15 comp_mirror = Klass::cast(element_klass)->java_mirror();
1.16 }
1.17 assert(comp_mirror.not_null(), "must have a mirror");
1.18
1.19 // Two-way link between the array klass and its component mirror:
1.20 - arrayKlass::cast(k())->set_component_mirror(comp_mirror());
1.21 + ArrayKlass::cast(k())->set_component_mirror(comp_mirror());
1.22 set_array_klass(comp_mirror(), k());
1.23 } else {
1.24 assert(k->oop_is_instance(), "Must be");
1.25 @@ -704,7 +704,7 @@
1.26 #ifdef ASSERT
1.27 if (is_primitive) {
1.28 Klass* k = ((Klass*)java_class->metadata_field(_array_klass_offset));
1.29 - assert(k == NULL || is_java_primitive(arrayKlass::cast(k)->element_type()),
1.30 + assert(k == NULL || is_java_primitive(ArrayKlass::cast(k)->element_type()),
1.31 "Should be either the T_VOID primitive or a java primitive");
1.32 }
1.33 #endif
1.34 @@ -719,7 +719,7 @@
1.35 BasicType type = T_VOID;
1.36 if (ak != NULL) {
1.37 // Note: create_basic_type_mirror above initializes ak to a non-null value.
1.38 - type = arrayKlass::cast(ak)->element_type();
1.39 + type = ArrayKlass::cast(ak)->element_type();
1.40 } else {
1.41 assert(java_class == Universe::void_mirror(), "only valid non-array primitive");
1.42 }
1.43 @@ -846,7 +846,7 @@
1.44
1.45 typeArrayOop java_lang_Thread::name(oop java_thread) {
1.46 oop name = java_thread->obj_field(_name_offset);
1.47 - assert(name == NULL || (name->is_typeArray() && typeArrayKlass::cast(name->klass())->element_type() == T_CHAR), "just checking");
1.48 + assert(name == NULL || (name->is_typeArray() && TypeArrayKlass::cast(name->klass())->element_type() == T_CHAR), "just checking");
1.49 return typeArrayOop(name);
1.50 }
1.51
