diff -r d503911aa948 -r a3919f5e8d2b hotspot/src/share/vm/oops/objArrayOop.hpp
--- a/hotspot/src/share/vm/oops/objArrayOop.hpp	Wed Apr 12 17:53:18 2017 +0200
+++ b/hotspot/src/share/vm/oops/objArrayOop.hpp	Tue Jul 04 15:58:10 2017 +0200
@@ -62,7 +62,7 @@
     if (HeapWordsPerOop > 0) {
       old_res = length * HeapWordsPerOop;
     } else {
-      old_res = align_size_up((uint)length, OopsPerHeapWord)/OopsPerHeapWord;
+      old_res = align_up((uint)length, OopsPerHeapWord)/OopsPerHeapWord;
     }
     assert(res == old_res, "Inconsistency between old and new.");
 #endif  // ASSERT