--- a/hotspot/src/share/vm/oops/constMethod.cpp	Wed Apr 12 17:53:18 2017 +0200
+++ b/hotspot/src/share/vm/oops/constMethod.cpp	Tue Jul 04 15:58:10 2017 +0200
@@ -128,7 +128,7 @@
   }
 
   // Align sizes up to a word.
-  extra_bytes = align_size_up(extra_bytes, BytesPerWord);
+  extra_bytes = align_up(extra_bytes, BytesPerWord);
 
   // One pointer per annotation array
   if (sizes->method_annotations_length() > 0) {
@@ -144,7 +144,7 @@
     extra_bytes += sizeof(AnnotationArray*);
   }
 
-  int extra_words = align_size_up(extra_bytes, BytesPerWord) / BytesPerWord;
+  int extra_words = align_up(extra_bytes, BytesPerWord) / BytesPerWord;
   assert(extra_words == extra_bytes/BytesPerWord, "should already be aligned");
   return align_metadata_size(header_size() + extra_words);
 }