Mercurial > hg > truffle
changeset 4056:448691f285a5
7106944: assert(_pc == *pc_addr) failed may be too strong
Reviewed-by: kvn, never
author | twisti |
---|---|
date | Thu, 03 Nov 2011 04:12:49 -0700 |
parents | e342a5110bed |
children | 1feb272af3a7 |
files | src/cpu/x86/vm/frame_x86.cpp |
diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.cpp Thu Nov 03 01:43:26 2011 -0700 +++ b/src/cpu/x86/vm/frame_x86.cpp Thu Nov 03 04:12:49 2011 -0700 @@ -234,10 +234,12 @@ void frame::patch_pc(Thread* thread, address pc) { address* pc_addr = &(((address*) sp())[-1]); if (TracePcPatching) { - tty->print_cr("patch_pc at address " INTPTR_FORMAT " [" INTPTR_FORMAT " -> " INTPTR_FORMAT "] ", + tty->print_cr("patch_pc at address " INTPTR_FORMAT " [" INTPTR_FORMAT " -> " INTPTR_FORMAT "]", pc_addr, *pc_addr, pc); } - assert(_pc == *pc_addr, err_msg("must be: " INTPTR_FORMAT " == " INTPTR_FORMAT, _pc, *pc_addr)); + // Either the return address is the original one or we are going to + // patch in the same address that's already there. + assert(_pc == *pc_addr || pc == *pc_addr, "must be"); *pc_addr = pc; _cb = CodeCache::find_blob(pc); address original_pc = nmethod::get_deopt_original_pc(this);