1.1 --- a/src/share/vm/memory/oopFactory.cpp Fri Sep 28 14:36:20 2012 -0700 1.2 +++ b/src/share/vm/memory/oopFactory.cpp Sat Sep 29 06:40:00 2012 -0400 1.3 @@ -47,12 +47,12 @@ 1.4 } 1.5 1.6 typeArrayOop oopFactory::new_tenured_charArray(int length, TRAPS) { 1.7 - return typeArrayKlass::cast(Universe::charArrayKlassObj())->allocate(length, THREAD); 1.8 + return TypeArrayKlass::cast(Universe::charArrayKlassObj())->allocate(length, THREAD); 1.9 } 1.10 1.11 typeArrayOop oopFactory::new_typeArray(BasicType type, int length, TRAPS) { 1.12 Klass* type_asKlassOop = Universe::typeArrayKlassObj(type); 1.13 - typeArrayKlass* type_asArrayKlass = typeArrayKlass::cast(type_asKlassOop); 1.14 + TypeArrayKlass* type_asArrayKlass = TypeArrayKlass::cast(type_asKlassOop); 1.15 typeArrayOop result = type_asArrayKlass->allocate(length, THREAD); 1.16 return result; 1.17 } 1.18 @@ -66,14 +66,14 @@ 1.19 typeArrayOop oopFactory::new_metaDataArray(int length, TRAPS) { 1.20 BasicType type = LP64_ONLY(T_LONG) NOT_LP64(T_INT); 1.21 Klass* type_asKlassOop = Universe::typeArrayKlassObj(type); 1.22 - typeArrayKlass* type_asArrayKlass = typeArrayKlass::cast(type_asKlassOop); 1.23 + TypeArrayKlass* type_asArrayKlass = TypeArrayKlass::cast(type_asKlassOop); 1.24 typeArrayOop result = type_asArrayKlass->allocate_common(length, true, THREAD); 1.25 return result; 1.26 } 1.27 1.28 typeArrayOop oopFactory::new_typeArray_nozero(BasicType type, int length, TRAPS) { 1.29 Klass* type_asKlassOop = Universe::typeArrayKlassObj(type); 1.30 - typeArrayKlass* type_asArrayKlass = typeArrayKlass::cast(type_asKlassOop); 1.31 + TypeArrayKlass* type_asArrayKlass = TypeArrayKlass::cast(type_asKlassOop); 1.32 typeArrayOop result = type_asArrayKlass->allocate_common(length, false, THREAD); 1.33 return result; 1.34 } 1.35 @@ -82,7 +82,7 @@ 1.36 objArrayOop oopFactory::new_objArray(Klass* klass, int length, TRAPS) { 1.37 assert(klass->is_klass(), "must be instance class"); 1.38 if (klass->oop_is_array()) { 1.39 - return ((arrayKlass*)klass)->allocate_arrayArray(1, length, THREAD); 1.40 + return ((ArrayKlass*)klass)->allocate_arrayArray(1, length, THREAD); 1.41 } else { 1.42 assert (klass->oop_is_instance(), "new object array with klass not an InstanceKlass"); 1.43 return ((InstanceKlass*)klass)->allocate_objArray(1, length, THREAD);