src/share/vm/classfile/javaClasses.inline.hpp

rev 12906 : [mq]: gc_interface

@@ -63,24 +63,28 @@
   assert(is_instance(java_string), "must be java_string");
   jbyte coder = java_string->byte_field(coder_offset);
   assert(CompactStrings || coder == CODER_UTF16, "Must be UTF16 without CompactStrings");
   return coder == CODER_LATIN1;
 }
-int java_lang_String::length(oop java_string) {
+
+int java_lang_String::length(oop java_string, typeArrayOop value_array) {
   assert(initialized, "Must be initialized");
   assert(is_instance(java_string), "must be java_string");
-  typeArrayOop value_array = ((typeArrayOop)java_string->obj_field(value_offset));
   if (value_array == NULL) {
     return 0;
   }
   int arr_length = value_array->length();
   if (!is_latin1(java_string)) {
     assert((arr_length & 1) == 0, "should be even for UTF16 string");
     arr_length >>= 1; // convert number of bytes to number of elements
   }
   return arr_length;
 }
+int java_lang_String::length(oop java_string) {
+  typeArrayOop value_array = (typeArrayOop)java_string->obj_field(value_offset);
+  return length(java_string, value_array);
+}
 
 bool java_lang_String::is_instance_inlined(oop obj) {
   return obj != NULL && obj->klass() == SystemDictionary::String_klass();
 }