Mercurial > hg > openjdk > jdk9 > hotspot
changeset 12802:516a043eb368
8182581: aarch64: fix for crash caused by earlyret of compiled method
Summary: fix jvm crash caused by earlyret of compiled method for aarch64 port
Reviewed-by: aph
Contributed-by: snazarkin@azul.com
author | fyang |
---|---|
date | Tue, 20 Jun 2017 17:00:07 +0800 |
parents | 8346c00b2ba6 |
children | 8f04d457168b |
files | src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp |
diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp Sat Jun 17 11:50:50 2017 -0700 +++ b/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp Tue Jun 20 17:00:07 2017 +0800 @@ -109,9 +109,15 @@ // for the callee's params we only need to account for the extra // locals. int size = overhead + - (callee_locals - callee_params)*Interpreter::stackElementWords + + (callee_locals - callee_params) + monitors * frame::interpreter_frame_monitor_size() + - temps* Interpreter::stackElementWords + extra_args; + // On the top frame, at all times SP <= ESP, and SP is + // 16-aligned. We ensure this by adjusting SP on method + // entry and re-entry to allow room for the maximum size of + // the expression stack. When we call another method we bump + // SP so that no stack space is wasted. So, only on the top + // frame do we need to allow max_stack words. + (is_top_frame ? max_stack : temps + extra_args); // On AArch64 we always keep the stack pointer 16-aligned, so we // must round up here.