# HG changeset patch # User Doug Simon # Date 1389252658 -3600 # Node ID 1302b727b5cdb785f61cf15dda187fae78a4c95f # Parent 5335d65fec563d150d5197f44a5f4d40a20681a7 added assertion for correct format argument in a safepoint poll reloc info diff -r 5335d65fec56 -r 1302b727b5cd src/cpu/x86/vm/relocInfo_x86.cpp --- a/src/cpu/x86/vm/relocInfo_x86.cpp Thu Jan 09 08:29:54 2014 +0100 +++ b/src/cpu/x86/vm/relocInfo_x86.cpp Thu Jan 09 08:30:58 2014 +0100 @@ -181,6 +181,9 @@ #ifdef _LP64 typedef Assembler::WhichOperand WhichOperand; WhichOperand which = (WhichOperand) format(); +#ifndef GRAAL + assert((which == Assembler::disp32_operand) == !Assembler::is_polling_page_far(), "format not set correctly"); +#endif if (which == Assembler::disp32_operand) { address orig_addr = old_addr_for(addr(), src, dest); NativeInstruction* oni = nativeInstruction_at(orig_addr);