Changeset 53456 in webkit for trunk/JavaScriptCore/runtime/UString.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/UString.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/UString.cpp

@@ -349 +349 @@
 UString UString::spliceSubstringsWithSeparators(const Range* substringRanges, int rangeCount, const UString* separators, int separatorCount) const
 {
+    m_rep->checkConsistency();
+
     if (rangeCount == 1 && separatorCount == 0) {
         int thisSize = size();
@@ -390 +392 @@
 UString UString::replaceRange(int rangeStart, int rangeLength, const UString& replacement) const
 {
+    m_rep->checkConsistency();
+
     int replacementLength = replacement.size();
     int totalLength = size() - rangeLength + replacementLength;