Merge
authoriveresov
Wed, 18 Jun 2014 12:21:39 -0700
changeset 25068 de4b1c96dca3
parent 25066 57d8cb758cf8 (current diff)
parent 25067 3b9a0ebd9a27 (diff)
child 25069 c937c5e883c5
Merge
--- a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Wed Jun 18 13:58:13 2014 -0400
+++ b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp	Wed Jun 18 12:21:39 2014 -0700
@@ -625,6 +625,7 @@
     __ lea(rscratch1, polling_page);
     offset = __ offset();
     add_debug_info_for_branch(info);
+    __ relocate(relocInfo::poll_type);
     __ testl(rax, Address(rscratch1, 0));
   } else {
     add_debug_info_for_branch(info);