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

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/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 || isStatic())
+    if (m_length < s_minLengthToShare)
+        return 0;
+    ASSERT(!isStatic());
+
+    UStringImpl* owner = bufferOwnerString();
+    if (owner->bufferOwnership() == BufferInternal)
         return 0;
 
-    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;
+    return owner->baseSharedBuffer();
 }
 
@@ -62 +63 @@
 {
     ASSERT(!isStatic());
+    checkConsistency();
 
     if (isIdentifier())
         Identifier::remove(this);
 
-    switch (bufferOwnership()) {
-    case BufferInternal:
-        return;
-    case BufferOwned:
-        fastFree(m_data);
-        return;
-    case BufferSubstring:
-        m_bufferSubstring->deref();
-        return;
-    case BufferShared:
-        m_bufferSubstring->deref();
+    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();
+        }
     }
 }
 
-} // namespace JSC
+}