*** old/src/cpu/x86/vm/interpreter_x86_32.cpp	Thu Dec  3 14:02:19 2015
--- new/src/cpu/x86/vm/interpreter_x86_32.cpp	Thu Dec  3 14:02:18 2015

*** 36,46 ****
--- 36,45 ----
  #include "oops/oop.inline.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "prims/jvmtiThreadState.hpp"
  #include "prims/methodHandles.hpp"
  #include "runtime/arguments.hpp"
  #include "runtime/deoptimization.hpp"
  #include "runtime/frame.inline.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "runtime/stubRoutines.hpp"
  #include "runtime/synchronizer.hpp"
  #include "runtime/timer.hpp"

*** 182,203 ****
--- 181,185 ----
    __ mov(rsp, rsi);                          // set sp to sender sp
    __ jmp(rdi);
  
    return entry_point;
  }
  
  
  void Deoptimization::unwind_callee_save_values(frame* f, vframeArray* vframe_array) {
  
    // This code is sort of the equivalent of C2IAdapter::setup_stack_frame back in
    // the days we had adapter frames. When we deoptimize a situation where a
    // compiled caller calls a compiled caller will have registers it expects
    // to survive the call to the callee. If we deoptimize the callee the only
    // way we can restore these registers is to have the oldest interpreter
    // frame that we create restore these values. That is what this routine
    // will accomplish.
  
    // At the moment we have modified c2 to not have any callee save registers
    // so this problem does not exist and this routine is just a place holder.
  
    assert(f->is_interpreted_frame(), "must be interpreted");
  }