1.1 --- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Mon Mar 31 13:08:03 2014 -0700 1.2 +++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Wed Apr 02 11:24:51 2014 -0700 1.3 @@ -801,7 +801,13 @@ 1.4 if (UseCompressedOops && !wide) { 1.5 __ movl(as_Address(addr), (int32_t)NULL_WORD); 1.6 } else { 1.7 +#ifdef _LP64 1.8 + __ xorptr(rscratch1, rscratch1); 1.9 + null_check_here = code_offset(); 1.10 + __ movptr(as_Address(addr), rscratch1); 1.11 +#else 1.12 __ movptr(as_Address(addr), NULL_WORD); 1.13 +#endif 1.14 } 1.15 } else { 1.16 if (is_literal_address(addr)) {