diff -r a3919f5e8d2b -r 750c6edff33b hotspot/src/cpu/arm/vm/arm.ad
--- a/hotspot/src/cpu/arm/vm/arm.ad	Tue Jul 04 15:58:10 2017 +0200
+++ b/hotspot/src/cpu/arm/vm/arm.ad	Thu Apr 13 09:57:51 2017 +0200
@@ -1881,7 +1881,7 @@
   // Ret Addr is on stack in slot 0 if no locks or verification or alignment.
   // Otherwise, it is above the locks and verification slot and alignment word
   return_addr(STACK - 1*VMRegImpl::slots_per_word +
-              round_to((Compile::current()->in_preserve_stack_slots() +
+              align_up((Compile::current()->in_preserve_stack_slots() +
                         Compile::current()->fixed_slots()),
                        stack_alignment_in_slots()));