diff -r b01a48301e67 -r e3cf184080bc hotspot/src/share/vm/c1/c1_Runtime1.cpp --- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp Fri Sep 28 14:36:20 2012 -0700 +++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp Sat Sep 29 06:40:00 2012 -0400 @@ -327,7 +327,7 @@ // anymore after new_typeArray() and no GC can happen before. // (This may have to change if this code changes!) assert(klass->is_klass(), "not a class"); - BasicType elt_type = typeArrayKlass::cast(klass)->element_type(); + BasicType elt_type = TypeArrayKlass::cast(klass)->element_type(); oop obj = oopFactory::new_typeArray(elt_type, length, CHECK); thread->set_vm_result(obj); // This is pretty rare but this runtime patch is stressful to deoptimization @@ -346,7 +346,7 @@ // anymore after new_objArray() and no GC can happen before. // (This may have to change if this code changes!) assert(array_klass->is_klass(), "not a class"); - Klass* elem_klass = objArrayKlass::cast(array_klass)->element_klass(); + Klass* elem_klass = ObjArrayKlass::cast(array_klass)->element_klass(); objArrayOop obj = oopFactory::new_objArray(elem_klass, length, CHECK); thread->set_vm_result(obj); // This is pretty rare but this runtime patch is stressful to deoptimization @@ -362,7 +362,7 @@ assert(klass->is_klass(), "not a class"); assert(rank >= 1, "rank must be nonzero"); - oop obj = arrayKlass::cast(klass)->multi_allocate(rank, dims, CHECK); + oop obj = ArrayKlass::cast(klass)->multi_allocate(rank, dims, CHECK); thread->set_vm_result(obj); JRT_END @@ -1234,8 +1234,8 @@ bs->write_ref_array((HeapWord*)dst_addr, length); return ac_ok; } else { - Klass* bound = objArrayKlass::cast(dst->klass())->element_klass(); - Klass* stype = objArrayKlass::cast(src->klass())->element_klass(); + Klass* bound = ObjArrayKlass::cast(dst->klass())->element_klass(); + Klass* stype = ObjArrayKlass::cast(src->klass())->element_klass(); if (stype == bound || Klass::cast(stype)->is_subtype_of(bound)) { // Elements are guaranteed to be subtypes, so no check necessary bs->write_ref_array_pre(dst_addr, length); @@ -1263,7 +1263,7 @@ if (src->is_typeArray()) { Klass* const klass_oop = src->klass(); if (klass_oop != dst->klass()) return ac_failed; - typeArrayKlass* klass = typeArrayKlass::cast(klass_oop); + TypeArrayKlass* klass = TypeArrayKlass::cast(klass_oop); const int l2es = klass->log2_element_size(); const int ihs = klass->array_header_in_bytes() / wordSize; char* src_addr = (char*) ((oopDesc**)src + ihs) + (src_pos << l2es);