*** old/src/cpu/x86/vm/macroAssembler_x86.cpp	Thu Mar  6 11:59:49 2014
--- new/src/cpu/x86/vm/macroAssembler_x86.cpp	Thu Mar  6 11:59:48 2014

*** 5689,5718 ****
--- 5689,5720 ----
  
  #endif // _LP64
  
  
  // C2 compiled method's prolog code.
! void MacroAssembler::verified_entry(int framesize, bool stack_bang, bool fp_mode_24b) {
! void MacroAssembler::verified_entry(int framesize, int stack_bang_size, bool fp_mode_24b) {
  
    // WARNING: Initial instruction MUST be 5 bytes or longer so that
    // NativeJump::patch_verified_entry will be able to patch out the entry
    // code safely. The push to verify stack depth is ok at 5 bytes,
    // the frame allocation can be either 3 or 6 bytes. So if we don't do
    // stack bang then we must use the 6 byte frame allocation even if
    // we have no frame. :-(
+   assert(stack_bang_size >= framesize || stack_bang_size <= 0, "stack bang size incorrect");
    
    assert((framesize & (StackAlignmentInBytes-1)) == 0, "frame size not aligned");
    // Remove word for return addr
    framesize -= wordSize;
+   stack_bang_size -= wordSize;
  
    // Calls to C2R adapters often do not accept exceptional returns.
    // We require that their callers must bang for them.  But be careful, because
    // some VM calls (such as call site linkage) can use several kilobytes of
    // stack.  But the stack safety zone should account for that.
    // See bugs 4446381, 4468289, 4497237.
!   if (stack_bang_size > 0) {
!     generate_stack_overflow_check(framesize);
!     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);
      // Remove word for ebp