*** old/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp	Fri May 29 13:57:34 2015
--- new/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp	Fri May 29 13:57:34 2015

*** 357,366 ****
--- 357,369 ----
    // the SharedRuntime stack overflow handling to be consistent
    // between the two compilers.
    generate_stack_overflow_check(bang_size_in_bytes);
  
    push(rbp);
+   if (PreserveFramePointer) {
+     mov(rbp, rsp);
+   }
  #ifdef TIERED
    // c2 leaves fpu stack dirty. Clean it on entry
    if (UseSSE < 2 ) {
      empty_FPU_stack();
    }