--- a/src/hotspot/share/classfile/classFileParser.cpp	Thu Mar 28 20:45:40 2019 -0700
+++ b/src/hotspot/share/classfile/classFileParser.cpp	Fri Mar 29 08:36:33 2019 +0100
@@ -312,7 +312,7 @@
           const char* const str = java_lang_String::as_utf8_string(patch());
           // (could use java_lang_String::as_symbol instead, but might as well batch them)
           utf8_buffer = (const u1*) str;
-          utf8_length = (int) strlen(str);
+          utf8_length = (u2) strlen(str);
         }
 
         unsigned int hash;