1.1 --- a/src/cpu/sparc/vm/stubGenerator_sparc.cpp Fri Jan 06 16:18:29 2012 -0800
1.2 +++ b/src/cpu/sparc/vm/stubGenerator_sparc.cpp Fri Jan 06 20:09:20 2012 -0800
1.3 @@ -3046,8 +3046,7 @@
1.4 // array_tag: typeArray = 0x3, objArray = 0x2, non-array = 0x0
1.5 //
1.6
1.7 - int lh_offset = klassOopDesc::header_size() * HeapWordSize +
1.8 - Klass::layout_helper_offset_in_bytes();
1.9 + int lh_offset = in_bytes(Klass::layout_helper_offset());
1.10
1.11 // Load 32-bits signed value. Use br() instruction with it to check icc.
1.12 __ lduw(G3_src_klass, lh_offset, G5_lh);
1.13 @@ -3194,15 +3193,13 @@
1.14 G4_dst_klass, G3_src_klass);
1.15
1.16 // Generate the type check.
1.17 - int sco_offset = (klassOopDesc::header_size() * HeapWordSize +
1.18 - Klass::super_check_offset_offset_in_bytes());
1.19 + int sco_offset = in_bytes(Klass::super_check_offset_offset());
1.20 __ lduw(G4_dst_klass, sco_offset, sco_temp);
1.21 generate_type_check(G3_src_klass, sco_temp, G4_dst_klass,
1.22 O5_temp, L_plain_copy);
1.23
1.24 // Fetch destination element klass from the objArrayKlass header.
1.25 - int ek_offset = (klassOopDesc::header_size() * HeapWordSize +
1.26 - objArrayKlass::element_klass_offset_in_bytes());
1.27 + int ek_offset = in_bytes(objArrayKlass::element_klass_offset());
1.28
1.29 // the checkcast_copy loop needs two extra arguments:
1.30 __ ld_ptr(G4_dst_klass, ek_offset, O4); // dest elem klass
