# HG changeset patch
# User Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
# Date 1362517131 -3600
# Node ID a413bcd552a4293f469cefc03280c3111d5f777c
# Parent  1c05f6f747d3f3edbd73b7312c2b42af2941f907
Relax safepoint polling assertion.

diff -r 1c05f6f747d3 -r a413bcd552a4 src/cpu/x86/vm/nativeInst_x86.hpp
--- a/src/cpu/x86/vm/nativeInst_x86.hpp	Tue Mar 05 21:21:45 2013 +0100
+++ b/src/cpu/x86/vm/nativeInst_x86.hpp	Tue Mar 05 21:58:51 2013 +0100
@@ -574,6 +574,10 @@
       return false;
     }
   } else {
+#ifdef GRAAL
+    // Graal may allocate an arbitrary register for storing the polling address.
+    return true;
+#else
     if (ubyte_at(0) == Assembler::REX_WR && ubyte_at(1) == NativeMovRegMem::instruction_code_mem2reg && ubyte_at(2) == 0x15) { // mov r10, rip[...]
       address fault = addr_at(7) + int_at(3);
       return os::is_poll_address(fault);
@@ -583,6 +587,7 @@
     } else {
       return false;
     }
+#endif
   }
 #else
   return ( ubyte_at(0) == NativeMovRegMem::instruction_code_mem2reg ||