Changeset 53456 in webkit for trunk/JavaScriptCore/wtf/StringHashFunctions.h

Timestamp:

Jan 18, 2010, 11:22:51 PM (15 years ago)

Author:

[email protected]

Message:

Revert r53454, since it causes much sadness in this world.

Patch by Gavin Barraclough <​[email protected]> on 2010-01-18
Reviewed by NOBODY (build fix).

• runtime/UString.cpp:

(JSC::UString::spliceSubstringsWithSeparators):
(JSC::UString::replaceRange):

• runtime/UStringImpl.cpp:

(JSC::UStringImpl::baseSharedBuffer):
(JSC::UStringImpl::sharedBuffer):
(JSC::UStringImpl::~UStringImpl):

• runtime/UStringImpl.h:

(JSC::UntypedPtrAndBitfield::UntypedPtrAndBitfield):
(JSC::UntypedPtrAndBitfield::asPtr):
(JSC::UntypedPtrAndBitfield::operator&=):
(JSC::UntypedPtrAndBitfield::operator|=):
(JSC::UntypedPtrAndBitfield::operator&):
(JSC::UStringImpl::create):
(JSC::UStringImpl::cost):
(JSC::UStringImpl::isIdentifier):
(JSC::UStringImpl::setIsIdentifier):
(JSC::UStringImpl::ref):
(JSC::UStringImpl::deref):
(JSC::UStringImpl::checkConsistency):
(JSC::UStringImpl::UStringImpl):
(JSC::UStringImpl::bufferOwnerString):
(JSC::UStringImpl::bufferOwnership):
(JSC::UStringImpl::isStatic):

• wtf/StringHashFunctions.h:

(WTF::stringHash):

File:

• trunk/JavaScriptCore/wtf/StringHashFunctions.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/StringHashFunctions.h

@@ -61 +61 @@
     hash ^= hash << 10;
 
+    hash &= 0x7fffffff;
+
     // this avoids ever returning a hash code of 0, since that is used to
     // signal "hash not computed yet", using a value that is likely to be
     // effectively the same as 0 when the low bits are masked
     if (hash == 0)
-        hash = 0x80000000;
+        hash = 0x40000000;
 
     return hash;
@@ -99 +101 @@
     hash ^= hash << 10;
 
+    hash &= 0x7fffffff;
+
     // this avoids ever returning a hash code of 0, since that is used to
     // signal "hash not computed yet", using a value that is likely to be
     // effectively the same as 0 when the low bits are masked
     if (hash == 0)
-        hash = 0x80000000;
+        hash = 0x40000000;
 
     return hash;
@@ -138 +142 @@
     hash ^= hash << 10;
 
+    hash &= 0x7fffffff;
+
     // This avoids ever returning a hash code of 0, since that is used to
     // signal "hash not computed yet", using a value that is likely to be
     // effectively the same as 0 when the low bits are masked.
     if (hash == 0)
-        hash = 0x80000000;
+        hash = 0x40000000;
 
     return hash;