*** old/src/share/vm/runtime/deoptimization.cpp	Tue Sep  6 17:46:28 2011
--- new/src/share/vm/runtime/deoptimization.cpp	Tue Sep  6 17:46:28 2011

*** 484,496 ****
--- 484,497 ----
                                        caller_actual_parameters,
                                        number_of_frames,
                                        frame_sizes,
                                        frame_pcs,
                                        return_type);
!   // On some platforms, we need a way to pass fp to the unpacking code
    // so the skeletal frames come out correct.
    info->set_initial_fp((intptr_t) array->sender().fp());
!   // On some platforms, we need a way to pass some platform dependent
+   // information to the unpacking code so the skeletal frames come out
+   // correct (initial fp value, unextended sp, ...)
+   info->set_initial_fp((intptr_t) array->sender().initial_deoptimization_info());
  
    if (array->frames() > 1) {
      if (VerifyStack && TraceDeoptimization) {
        tty->print_cr("Deoptimizing method containing inlining");
      }