# HG changeset patch
# User vlivanov
# Date 1497966283 0
# Node ID 459f03270e867dc6fa6104eed516a9aa998dfa59
# Parent  db8ea3a102f2f188c2f0ddf436e63d9ee8955228# Parent  e56cfcaea55c4fce7162b4d605d4318875605498
Merge

diff -r e56cfcaea55c -r 459f03270e86 hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp
--- a/hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp	Tue Jun 20 14:37:25 2017 +0300
+++ b/hotspot/src/cpu/aarch64/vm/abstractInterpreter_aarch64.cpp	Tue Jun 20 13:44:43 2017 +0000
@@ -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.