Mercurial > hg > graal-compiler
comparison src/share/vm/classfile/javaClasses.cpp @ 7458:4daebd4cc1dd
Merge
author | minqi |
---|---|
date | Mon, 24 Dec 2012 11:46:38 -0800 |
parents | 35431a769282 2aa953165ade |
children | ade95d680b42 |
comparison
equal
deleted
inserted
replaced
7457:35431a769282 | 7458:4daebd4cc1dd |
---|---|
325 result[index] = value->char_at(index + offset); | 325 result[index] = value->char_at(index + offset); |
326 } | 326 } |
327 return result; | 327 return result; |
328 } | 328 } |
329 | 329 |
330 unsigned int java_lang_String::to_hash(oop java_string) { | 330 unsigned int java_lang_String::hash_code(oop java_string) { |
331 int length = java_lang_String::length(java_string); | 331 int length = java_lang_String::length(java_string); |
332 // Zero length string will hash to zero with String.toHash() function. | 332 // Zero length string will hash to zero with String.hashCode() function. |
333 if (length == 0) return 0; | 333 if (length == 0) return 0; |
334 | 334 |
335 typeArrayOop value = java_lang_String::value(java_string); | 335 typeArrayOop value = java_lang_String::value(java_string); |
336 int offset = java_lang_String::offset(java_string); | 336 int offset = java_lang_String::offset(java_string); |
337 return java_lang_String::to_hash(value->char_at_addr(offset), length); | 337 return java_lang_String::hash_code(value->char_at_addr(offset), length); |
338 } | 338 } |
339 | 339 |
340 char* java_lang_String::as_quoted_ascii(oop java_string) { | 340 char* java_lang_String::as_quoted_ascii(oop java_string) { |
341 typeArrayOop value = java_lang_String::value(java_string); | 341 typeArrayOop value = java_lang_String::value(java_string); |
342 int offset = java_lang_String::offset(java_string); | 342 int offset = java_lang_String::offset(java_string); |