Mercurial > hg > truffle
diff src/cpu/x86/vm/c1_MacroAssembler_x86.cpp @ 18018:7ef8ab2bf2b0
Merge
author | asaha |
---|---|
date | Tue, 17 Jun 2014 22:03:39 -0700 |
parents | 0bf37f737702 |
children | 52b4284cb496 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Tue Jun 17 15:49:31 2014 -0700 +++ b/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp Tue Jun 17 22:03:39 2014 -0700 @@ -349,13 +349,14 @@ } -void C1_MacroAssembler::build_frame(int frame_size_in_bytes) { +void C1_MacroAssembler::build_frame(int frame_size_in_bytes, int bang_size_in_bytes) { + assert(bang_size_in_bytes >= frame_size_in_bytes, "stack bang size incorrect"); // Make sure there is enough stack space for this method's activation. // Note that we do this before doing an enter(). This matches the // ordering of C2's stack overflow check / rsp decrement and allows // the SharedRuntime stack overflow handling to be consistent // between the two compilers. - generate_stack_overflow_check(frame_size_in_bytes); + generate_stack_overflow_check(bang_size_in_bytes); push(rbp); #ifdef TIERED