*** old/src/cpu/x86/vm/frame_x86.cpp	Mon Oct 10 06:19:26 2011
--- new/src/cpu/x86/vm/frame_x86.cpp	Mon Oct 10 06:19:25 2011

*** 230,244 ****
--- 230,246 ----
  
  }
  
  
  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 "] ",
!                   &((address *)sp())[-1], ((address *)sp())[-1], pc);
!                   pc_addr, *pc_addr, pc);
    }
!   ((address *)sp())[-1] = pc;
!   assert(_pc == *pc_addr, err_msg("must be: " INTPTR_FORMAT " == " INTPTR_FORMAT, _pc, *pc_addr));
+   *pc_addr = pc;
    _cb = CodeCache::find_blob(pc);
    address original_pc = nmethod::get_deopt_original_pc(this);
    if (original_pc != NULL) {
      assert(original_pc == _pc, "expected original PC to be stored before patching");
      _deopt_state = is_deoptimized;