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

*** 1801,1811 ****
--- 1801,1812 ----
    // 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();
    }
  

*** 3005,3019 ****
--- 3006,3024 ----
  
    // 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 array of frame pcs into ECX
    __ movptr(rcx,Address(rdi,Deoptimization::UnrollBlock::frame_pcs_offset_in_bytes()));
  
    __ pop(rsi); // trash the old pc

*** 3225,3240 ****
--- 3230,3248 ----
  
    // 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 array of frame pcs into ECX
    __ movl(rcx,Address(rdi,Deoptimization::UnrollBlock::frame_pcs_offset_in_bytes()));
  
    __ pop(rsi); // trash the pc