1.1 --- a/src/share/vm/opto/library_call.cpp Fri Feb 22 17:55:13 2008 -0800
1.2 +++ b/src/share/vm/opto/library_call.cpp Mon Feb 25 15:05:44 2008 -0800
1.3 @@ -2097,7 +2097,7 @@
1.4 int type_words = type2size[type];
1.5
1.6 // Cannot inline wide CAS on machines that don't support it natively
1.7 - if (type2aelembytes[type] > BytesPerInt && !VM_Version::supports_cx8())
1.8 + if (type2aelembytes(type) > BytesPerInt && !VM_Version::supports_cx8())
1.9 return false;
1.10
1.11 C->set_has_unsafe_access(true); // Mark eventual nmethod as "unsafe".
1.12 @@ -3975,7 +3975,7 @@
1.13 // both indices are constants
1.14 int s_offs = src_offset_inttype->get_con();
1.15 int d_offs = dest_offset_inttype->get_con();
1.16 - int element_size = type2aelembytes[t];
1.17 + int element_size = type2aelembytes(t);
1.18 aligned = ((arrayOopDesc::base_offset_in_bytes(t) + s_offs * element_size) % HeapWordSize == 0) &&
1.19 ((arrayOopDesc::base_offset_in_bytes(t) + d_offs * element_size) % HeapWordSize == 0);
1.20 if (s_offs >= d_offs) disjoint = true;
1.21 @@ -4389,7 +4389,7 @@
1.22 if (alloc != NULL && use_ReduceInitialCardMarks()) {
1.23 // If we do not need card marks, copy using the jint or jlong stub.
1.24 copy_type = LP64_ONLY(T_LONG) NOT_LP64(T_INT);
1.25 - assert(type2aelembytes[basic_elem_type] == type2aelembytes[copy_type],
1.26 + assert(type2aelembytes(basic_elem_type) == type2aelembytes(copy_type),
1.27 "sizes agree");
1.28 }
1.29 }
1.30 @@ -4659,7 +4659,7 @@
1.31 Node* mem = memory(adr_type); // memory slice to operate on
1.32
1.33 // scaling and rounding of indexes:
1.34 - int scale = exact_log2(type2aelembytes[basic_elem_type]);
1.35 + int scale = exact_log2(type2aelembytes(basic_elem_type));
1.36 int abase = arrayOopDesc::base_offset_in_bytes(basic_elem_type);
1.37 int clear_low = (-1 << scale) & (BytesPerInt - 1);
1.38 int bump_bit = (-1 << scale) & BytesPerInt;
1.39 @@ -4753,7 +4753,7 @@
1.40 Node* dest, Node* dest_offset,
1.41 Node* dest_size) {
1.42 // See if there is an advantage from block transfer.
1.43 - int scale = exact_log2(type2aelembytes[basic_elem_type]);
1.44 + int scale = exact_log2(type2aelembytes(basic_elem_type));
1.45 if (scale >= LogBytesPerLong)
1.46 return false; // it is already a block transfer
1.47
