# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1396406734 25200
# Node ID 1b96d1a7451467297ed8ff81355852d00d62b81b
# Parent  f8340493858816c699fd83d6d00add0464a204ca
fix c1 implicit null bug

diff -r f83404938588 -r 1b96d1a74514 src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
--- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Tue Apr 01 15:49:13 2014 -0700
+++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Tue Apr 01 19:45:34 2014 -0700
@@ -800,7 +800,13 @@
         if (UseCompressedOops && !wide) {
           __ movl(as_Address(addr), (int32_t)NULL_WORD);
         } else {
+#ifdef _LP64
+          __ xorptr(r10, r10);
+          null_check_here = code_offset();
+          __ movptr(as_Address(addr), r10);
+#else
           __ movptr(as_Address(addr), NULL_WORD);
+#endif
         }
       } else {
         if (is_literal_address(addr)) {