--- a/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp	Wed Apr 12 17:53:18 2017 +0200
+++ b/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp	Tue Jul 04 15:58:10 2017 +0200
@@ -57,8 +57,8 @@
  protected:
   enum Layout {
     istate_off = jf_header_words +
-      (align_size_up_(sizeof(BytecodeInterpreter),
-                      wordSize) >> LogBytesPerWord) - 1,
+      (align_up_(sizeof(BytecodeInterpreter),
+                 wordSize) >> LogBytesPerWord) - 1,
     header_words
   };