Mercurial > hg > truffle
diff src/share/vm/classfile/symbolTable.cpp @ 7482:989155e2d07a
Merge with hs25-b15.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 16 Jan 2013 01:34:24 +0100 |
parents | 2aa953165ade |
children | 0ede345ec7c9 |
line wrap: on
line diff
--- a/src/share/vm/classfile/symbolTable.cpp Tue Jan 15 18:54:02 2013 +0100 +++ b/src/share/vm/classfile/symbolTable.cpp Wed Jan 16 01:34:24 2013 +0100 @@ -179,7 +179,7 @@ unsigned int SymbolTable::hash_symbol(const char* s, int len) { return use_alternate_hashcode() ? AltHashing::murmur3_32(seed(), (const jbyte*)s, len) : - java_lang_String::to_hash(s, len); + java_lang_String::hash_code(s, len); } @@ -617,7 +617,7 @@ // Pick hashing algorithm unsigned int StringTable::hash_string(const jchar* s, int len) { return use_alternate_hashcode() ? AltHashing::murmur3_32(seed(), s, len) : - java_lang_String::to_hash(s, len); + java_lang_String::hash_code(s, len); } oop StringTable::lookup(int index, jchar* name,