# HG changeset patch
# User twisti
# Date 1320318769 25200
# Node ID 8b23df12c7f6d388a1340aab9a58ff607702d54d
# Parent  c25dd872c62fdf386ccb5520c169378b2a816cae
7106944: assert(_pc == *pc_addr) failed may be too strong
Reviewed-by: kvn, never

diff -r c25dd872c62f -r 8b23df12c7f6 hotspot/src/cpu/x86/vm/frame_x86.cpp
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp	Thu Nov 03 01:43:26 2011 -0700
+++ b/hotspot/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);