--- a/hotspot/src/share/vm/oops/constantPool.hpp	Wed Apr 12 17:53:18 2017 +0200
+++ b/hotspot/src/share/vm/oops/constantPool.hpp	Tue Jul 04 15:58:10 2017 +0200
@@ -756,7 +756,7 @@
 
   // Sizing (in words)
   static int header_size()             {
-    return align_size_up((int)sizeof(ConstantPool), wordSize) / wordSize;
+    return align_up((int)sizeof(ConstantPool), wordSize) / wordSize;
   }
   static int size(int length)          { return align_metadata_size(header_size() + length); }
   int size() const                     { return size(length()); }