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

Timestamp:

Jan 18, 2010, 9:51:40 PM (15 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=33731
Remove UntypedPtrAndBitfield from UStringImpl (akin to PtrAndFlags).

Patch by Gavin Barraclough <​[email protected]> on 2010-01-18
Reviewed by Oliver Hunt.

This break the OS X Leaks tool. Instead, free up some more bits from the refCount.

• runtime/UStringImpl.cpp:

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

• runtime/UStringImpl.h:

(JSC::UStringImpl::cost):
(JSC::UStringImpl::checkConsistency):
(JSC::UStringImpl::UStringImpl):
(JSC::UStringImpl::bufferOwnerString):
(JSC::UStringImpl::):

• 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 = 0x40000000;
+        hash = 0x80000000;
 
     return hash;
@@ -101 +99 @@
     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 = 0x40000000;
+        hash = 0x80000000;
 
     return hash;
@@ -142 +138 @@
     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 = 0x40000000;
+        hash = 0x80000000;
 
     return hash;