*** old/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Thu Mar 20 11:28:56 2014
--- new/src/cpu/x86/vm/sharedRuntime_x86_64.cpp	Thu Mar 20 11:28:56 2014

*** 1996,2006 ****
--- 1996,2007 ----
    // instruction fits that requirement.
  
    // Generate stack overflow check
  
    if (UseStackBanging) {
      __ bang_stack_with_offset(StackShadowPages*os::vm_page_size());
+     // See AbstractAssembler::generate_stack_overflow_check
+     __ bang_stack_with_offset((StackShadowPages+1)*os::vm_page_size());
    } else {
      // need a 5 byte instruction to allow MT safe patching to non-entrant
      __ fat_nop();
    }
  

*** 3475,3489 ****
--- 3476,3494 ----
  
    // Pick up the initial fp we should save
    // restore rbp before stack bang because if stack overflow is thrown it needs to be pushed (and preserved)
    __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_info_offset_in_bytes()));
  
    // Stack bang to make sure there's enough room for these interpreter frames.
+ #ifdef ASSERT
+   // Compilers generate code that bang the stack by as much as the
+   // interpreter would need. So this stack banging should never
+   // trigger a fault. Verify that it does not on non product builds.
    if (UseStackBanging) {
      __ movl(rbx, Address(rdi, Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
      __ bang_stack_size(rbx, rcx);
    }
+ #endif
  
    // Load address of array of frame pcs into rcx
    __ movptr(rcx, Address(rdi, Deoptimization::UnrollBlock::frame_pcs_offset_in_bytes()));
  
    // Trash the old pc

*** 3668,3682 ****
--- 3673,3691 ----
  
    // Pick up the initial fp we should save
    // restore rbp before stack bang because if stack overflow is thrown it needs to be pushed (and preserved)
    __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_info_offset_in_bytes()));
  
    // Stack bang to make sure there's enough room for these interpreter frames.
+ #ifdef ASSERT
+   // Compilers generate code that bang the stack by as much as the
+   // interpreter would need. So this stack banging should never
+   // trigger a fault. Verify that it does not on non product builds.
    if (UseStackBanging) {
      __ movl(rbx, Address(rdi ,Deoptimization::UnrollBlock::total_frame_sizes_offset_in_bytes()));
      __ bang_stack_size(rbx, rcx);
    }
+ #endif
  
    // Load address of array of frame pcs into rcx (address*)
    __ movptr(rcx, Address(rdi, Deoptimization::UnrollBlock::frame_pcs_offset_in_bytes()));
  
    // Trash the return pc