# HG changeset patch # User Doug Simon # Date 1389218364 -3600 # Node ID 5252d833945d022bb03b5601dccf2aeeeba8eaf0 # Parent 876d56394996f0fe4759c168c2a8690968ad7fd2 re-added relocation entry for safepoint polling instruction emitted by C1 on SPARC diff -r 876d56394996 -r 5252d833945d src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp --- a/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp Wed Jan 08 11:17:11 2014 -0800 +++ b/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp Wed Jan 08 22:59:24 2014 +0100 @@ -1610,10 +1610,9 @@ int LIR_Assembler::safepoint_poll(LIR_Opr tmp, CodeEmitInfo* info) { __ set((intptr_t)os::get_polling_page(), tmp->as_register()); + __ relocate(relocInfo::poll_type); if (info != NULL) { add_debug_info_for_branch(info); - } else { - __ relocate(relocInfo::poll_type); } int offset = __ offset();