--- a/hotspot/src/share/vm/oops/cpCache.hpp	Wed Apr 12 17:53:18 2017 +0200
+++ b/hotspot/src/share/vm/oops/cpCache.hpp	Tue Jul 04 15:58:10 2017 +0200
@@ -362,7 +362,7 @@
 
   // Code generation support
   static WordSize size()                         {
-    return in_WordSize(align_size_up((int)sizeof(ConstantPoolCacheEntry), wordSize) / wordSize);
+    return in_WordSize(align_up((int)sizeof(ConstantPoolCacheEntry), wordSize) / wordSize);
   }
   static ByteSize size_in_bytes()                { return in_ByteSize(sizeof(ConstantPoolCacheEntry)); }
   static ByteSize indices_offset()               { return byte_offset_of(ConstantPoolCacheEntry, _indices); }