--- a/hotspot/src/share/vm/oops/constantPool.hpp	Fri Apr 07 10:51:28 2017 +0000
+++ b/hotspot/src/share/vm/oops/constantPool.hpp	Fri Apr 07 13:42:00 2017 +0100
@@ -705,7 +705,9 @@
   }
 
   // Sizing (in words)
-  static int header_size()             { return sizeof(ConstantPool)/wordSize; }
+  static int header_size()             {
+    return align_size_up(sizeof(ConstantPool), wordSize) / wordSize;
+  }
   static int size(int length)          { return align_metadata_size(header_size() + length); }
   int size() const                     { return size(length()); }
 #if INCLUDE_SERVICES