1.1 --- a/src/share/vm/opto/runtime.cpp Fri Sep 28 14:36:20 2012 -0700
1.2 +++ b/src/share/vm/opto/runtime.cpp Sat Sep 29 06:40:00 2012 -0400
1.3 @@ -286,13 +286,13 @@
1.4 if (Klass::cast(array_type)->oop_is_typeArray()) {
1.5 // The oopFactory likes to work with the element type.
1.6 // (We could bypass the oopFactory, since it doesn't add much value.)
1.7 - BasicType elem_type = typeArrayKlass::cast(array_type)->element_type();
1.8 + BasicType elem_type = TypeArrayKlass::cast(array_type)->element_type();
1.9 result = oopFactory::new_typeArray(elem_type, len, THREAD);
1.10 } else {
1.11 // Although the oopFactory likes to work with the elem_type,
1.12 // the compiler prefers the array_type, since it must already have
1.13 // that latter value in hand for the fast path.
1.14 - Klass* elem_type = objArrayKlass::cast(array_type)->element_klass();
1.15 + Klass* elem_type = ObjArrayKlass::cast(array_type)->element_klass();
1.16 result = oopFactory::new_objArray(elem_type, len, THREAD);
1.17 }
1.18
1.19 @@ -323,7 +323,7 @@
1.20
1.21 assert(Klass::cast(array_type)->oop_is_typeArray(), "should be called only for type array");
1.22 // The oopFactory likes to work with the element type.
1.23 - BasicType elem_type = typeArrayKlass::cast(array_type)->element_type();
1.24 + BasicType elem_type = TypeArrayKlass::cast(array_type)->element_type();
1.25 result = oopFactory::new_typeArray_nozero(elem_type, len, THREAD);
1.26
1.27 // Pass oops back through thread local storage. Our apparent type to Java
1.28 @@ -344,7 +344,7 @@
1.29 is_deoptimized_caller_frame(thread)) {
1.30 // Zero array here if the caller is deoptimized.
1.31 int size = ((typeArrayOop)result)->object_size();
1.32 - BasicType elem_type = typeArrayKlass::cast(array_type)->element_type();
1.33 + BasicType elem_type = TypeArrayKlass::cast(array_type)->element_type();
1.34 const size_t hs = arrayOopDesc::header_size(elem_type);
1.35 // Align to next 8 bytes to avoid trashing arrays's length.
1.36 const size_t aligned_hs = align_object_offset(hs);
1.37 @@ -370,7 +370,7 @@
1.38 jint dims[2];
1.39 dims[0] = len1;
1.40 dims[1] = len2;
1.41 - oop obj = arrayKlass::cast(elem_type)->multi_allocate(2, dims, THREAD);
1.42 + oop obj = ArrayKlass::cast(elem_type)->multi_allocate(2, dims, THREAD);
1.43 deoptimize_caller_frame(thread, HAS_PENDING_EXCEPTION);
1.44 thread->set_vm_result(obj);
1.45 JRT_END
1.46 @@ -386,7 +386,7 @@
1.47 dims[0] = len1;
1.48 dims[1] = len2;
1.49 dims[2] = len3;
1.50 - oop obj = arrayKlass::cast(elem_type)->multi_allocate(3, dims, THREAD);
1.51 + oop obj = ArrayKlass::cast(elem_type)->multi_allocate(3, dims, THREAD);
1.52 deoptimize_caller_frame(thread, HAS_PENDING_EXCEPTION);
1.53 thread->set_vm_result(obj);
1.54 JRT_END
1.55 @@ -403,7 +403,7 @@
1.56 dims[1] = len2;
1.57 dims[2] = len3;
1.58 dims[3] = len4;
1.59 - oop obj = arrayKlass::cast(elem_type)->multi_allocate(4, dims, THREAD);
1.60 + oop obj = ArrayKlass::cast(elem_type)->multi_allocate(4, dims, THREAD);
1.61 deoptimize_caller_frame(thread, HAS_PENDING_EXCEPTION);
1.62 thread->set_vm_result(obj);
1.63 JRT_END
1.64 @@ -421,7 +421,7 @@
1.65 dims[2] = len3;
1.66 dims[3] = len4;
1.67 dims[4] = len5;
1.68 - oop obj = arrayKlass::cast(elem_type)->multi_allocate(5, dims, THREAD);
1.69 + oop obj = ArrayKlass::cast(elem_type)->multi_allocate(5, dims, THREAD);
1.70 deoptimize_caller_frame(thread, HAS_PENDING_EXCEPTION);
1.71 thread->set_vm_result(obj);
1.72 JRT_END
1.73 @@ -438,7 +438,7 @@
1.74 jint *c_dims = NEW_RESOURCE_ARRAY(jint, len);
1.75 Copy::conjoint_jints_atomic(j_dims, c_dims, len);
1.76
1.77 - oop obj = arrayKlass::cast(elem_type)->multi_allocate(len, c_dims, THREAD);
1.78 + oop obj = ArrayKlass::cast(elem_type)->multi_allocate(len, c_dims, THREAD);
1.79 deoptimize_caller_frame(thread, HAS_PENDING_EXCEPTION);
1.80 thread->set_vm_result(obj);
1.81 JRT_END
