Mercurial > hg > truffle
diff src/share/vm/classfile/javaClasses.hpp @ 6166:58ad5f22317e
Merge
author | sla |
---|---|
date | Mon, 18 Jun 2012 11:33:17 +0200 |
parents | 8b0a4867acf0 e9140bf80b4a |
children | 1d7922586cf6 |
line wrap: on
line diff
--- a/src/share/vm/classfile/javaClasses.hpp Fri Jun 15 14:17:28 2012 -0700 +++ b/src/share/vm/classfile/javaClasses.hpp Mon Jun 18 11:33:17 2012 +0200 @@ -158,20 +158,16 @@ static jchar* as_unicode_string(oop java_string, int& length); // Compute the hash value for a java.lang.String object which would - // contain the characters passed in. This hash value is used for at - // least two purposes. - // - // (a) As the hash value used by the StringTable for bucket selection - // and comparison (stored in the HashtableEntry structures). This - // is used in the String.intern() method. + // contain the characters passed in. // - // (b) As the hash value used by the String object itself, in - // String.hashCode(). This value is normally calculate in Java code - // in the String.hashCode method(), but is precomputed for String - // objects in the shared archive file. + // As the hash value used by the String object itself, in + // String.hashCode(). This value is normally calculated in Java code + // in the String.hashCode method(), but is precomputed for String + // objects in the shared archive file. + // hash P(31) from Kernighan & Ritchie // - // For this reason, THIS ALGORITHM MUST MATCH String.hashCode(). - static unsigned int hash_string(jchar* s, int len) { + // For this reason, THIS ALGORITHM MUST MATCH String.toHash(). + template <typename T> static unsigned int to_hash(T* s, int len) { unsigned int h = 0; while (len-- > 0) { h = 31*h + (unsigned int) *s; @@ -179,6 +175,10 @@ } return h; } + static unsigned int to_hash(oop java_string); + + // This is the string hash code used by the StringTable, which may be + // the same as String.toHash or an alternate hash code. static unsigned int hash_string(oop java_string); static bool equals(oop java_string, jchar* chars, int len);