Changeset 53454 in webkit for trunk/JavaScriptCore/runtime/UStringImpl.cpp

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/runtime/UStringImpl.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/UStringImpl.cpp

@@ -36 +36 @@
 namespace JSC {
  
-SharedUChar* UStringImpl::baseSharedBuffer()
-{
-    ASSERT((bufferOwnership() == BufferShared)
-        || ((bufferOwnership() == BufferOwned) && !m_dataBuffer.asPtr<void*>()));
-
-    if (bufferOwnership() != BufferShared)
-        m_dataBuffer = UntypedPtrAndBitfield(SharedUChar::create(new OwnFastMallocPtr<UChar>(m_data)).releaseRef(), BufferShared);
-
-    return m_dataBuffer.asPtr<SharedUChar*>();
-}
-
 SharedUChar* UStringImpl::sharedBuffer()
 {
-    if (m_length < s_minLengthToShare)
-        return 0;
-    ASSERT(!isStatic());
-
-    UStringImpl* owner = bufferOwnerString();
-    if (owner->bufferOwnership() == BufferInternal)
+    if (m_length < s_minLengthToShare || isStatic())
         return 0;
 
-    return owner->baseSharedBuffer();
+    switch (bufferOwnership()) {
+    case BufferInternal:
+        return 0;
+    case BufferOwned:
+        m_bufferShared = SharedUChar::create(new OwnFastMallocPtr<UChar>(m_data)).releaseRef();
+        m_refCountAndFlags &= ~s_refCountMaskBufferOwnership;
+        m_refCountAndFlags |= BufferShared;
+        return m_bufferShared;
+    case BufferSubstring:
+        return m_bufferSubstring->sharedBuffer();
+    case BufferShared:
+        return m_bufferShared;
+    }
+
+    ASSERT_NOT_REACHED();
+    return 0;
 }
 
@@ -63 +62 @@
 {
     ASSERT(!isStatic());
-    checkConsistency();
 
     if (isIdentifier())
         Identifier::remove(this);
 
-    if (bufferOwnership() != BufferInternal) {
-        if (bufferOwnership() == BufferOwned)
-            fastFree(m_data);
-        else if (bufferOwnership() == BufferSubstring)
-            m_dataBuffer.asPtr<UStringImpl*>()->deref();
-        else {
-            ASSERT(bufferOwnership() == BufferShared);
-            m_dataBuffer.asPtr<SharedUChar*>()->deref();
-        }
+    switch (bufferOwnership()) {
+    case BufferInternal:
+        return;
+    case BufferOwned:
+        fastFree(m_data);
+        return;
+    case BufferSubstring:
+        m_bufferSubstring->deref();
+        return;
+    case BufferShared:
+        m_bufferSubstring->deref();
     }
 }
 
-}
+} // namespace JSC