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

*** 6120,6129 ****
--- 6120,6133 ----
      generate_stack_overflow_check(stack_bang_size);
  
      // We always push rbp, so that on return to interpreter rbp, will be
      // restored correctly and we can correct the stack.
      push(rbp);
+     // Save caller's stack pointer into RBP if the frame pointer is preserved.
+     if (PreserveFramePointer) {
+       mov(rbp, rsp);
+     }
      // Remove word for ebp
      framesize -= wordSize;
  
      // Create frame
      if (framesize) {

*** 6134,6143 ****
--- 6138,6152 ----
      subptr_imm32(rsp, framesize);
  
      // Save RBP register now.
      framesize -= wordSize;
      movptr(Address(rsp, framesize), rbp);
+     // Save caller's stack pointer into RBP if the frame pointer is preserved.
+     if (PreserveFramePointer) {
+       movptr(rbp, rsp);
+       addptr(rbp, framesize + wordSize);
+     }
    }
  
    if (VerifyStackAtCalls) { // Majik cookie to verify stack depth
      framesize -= wordSize;
      movptr(Address(rsp, framesize), (int32_t)0xbadb100d);