1.1 --- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Fri Sep 28 14:36:20 2012 -0700
1.2 +++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Sat Sep 29 06:40:00 2012 -0400
1.3 @@ -1881,7 +1881,7 @@
1.4 __ load_klass(klass_RInfo, value);
1.5
1.6 // get instance klass (it's already uncompressed)
1.7 - __ movptr(k_RInfo, Address(k_RInfo, objArrayKlass::element_klass_offset()));
1.8 + __ movptr(k_RInfo, Address(k_RInfo, ObjArrayKlass::element_klass_offset()));
1.9 // perform the fast part of the checking logic
1.10 __ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, success_target, failure_target, NULL);
1.11 // call out-of-line instance of __ check_klass_subtype_slow_path(...):
1.12 @@ -3349,7 +3349,7 @@
1.13
1.14 #ifndef _LP64
1.15 __ movptr(tmp, dst_klass_addr);
1.16 - __ movptr(tmp, Address(tmp, objArrayKlass::element_klass_offset()));
1.17 + __ movptr(tmp, Address(tmp, ObjArrayKlass::element_klass_offset()));
1.18 __ push(tmp);
1.19 __ movl(tmp, Address(tmp, Klass::super_check_offset_offset()));
1.20 __ push(tmp);
1.21 @@ -3375,14 +3375,14 @@
1.22 // Allocate abi space for args but be sure to keep stack aligned
1.23 __ subptr(rsp, 6*wordSize);
1.24 __ load_klass(c_rarg3, dst);
1.25 - __ movptr(c_rarg3, Address(c_rarg3, objArrayKlass::element_klass_offset()));
1.26 + __ movptr(c_rarg3, Address(c_rarg3, ObjArrayKlass::element_klass_offset()));
1.27 store_parameter(c_rarg3, 4);
1.28 __ movl(c_rarg3, Address(c_rarg3, Klass::super_check_offset_offset()));
1.29 __ call(RuntimeAddress(copyfunc_addr));
1.30 __ addptr(rsp, 6*wordSize);
1.31 #else
1.32 __ load_klass(c_rarg4, dst);
1.33 - __ movptr(c_rarg4, Address(c_rarg4, objArrayKlass::element_klass_offset()));
1.34 + __ movptr(c_rarg4, Address(c_rarg4, ObjArrayKlass::element_klass_offset()));
1.35 __ movl(c_rarg3, Address(c_rarg4, Klass::super_check_offset_offset()));
1.36 __ call(RuntimeAddress(copyfunc_addr));
1.37 #endif
