# HG changeset patch
# User iveresov
# Date 1403119299 25200
# Node ID de4b1c96dca37432f4d29d911fc71498293a9b5b
# Parent  57d8cb758cf8ee3cc1379fa8a85c3ec92e1ee0db# Parent  3b9a0ebd9a27e1b458a93739af8881ecf16c7e26
Merge

diff -r 57d8cb758cf8 -r de4b1c96dca3 hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
--- 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);