Changeset 52463 in webkit for trunk/JavaScriptCore/runtime/JSString.cpp

Timestamp:

Dec 21, 2009, 4:38:24 PM (15 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=32831
Replace UString::Rep implementation, following introduction of ropes to JSC.

Reviewed by Darin Adler.

JavaScriptCore:

• Remove redundant overcapacity mechanisms.
• Reduce memory cost of Rep's.
• Add an inline storage mechanism akin to that in WebCore's StringImpl.

~1% Sunspider progression.

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• runtime/JSString.cpp:

(JSC::JSString::resolveRope):

• runtime/SmallStrings.cpp:

(JSC::SmallStringsStorage::SmallStringsStorage):

• runtime/UString.cpp:

(JSC::initializeUString):
(JSC::createRep):
(JSC::UString::createFromUTF8):
(JSC::UString::createUninitialized):
(JSC::UString::spliceSubstringsWithSeparators):
(JSC::UString::replaceRange):
(JSC::UString::ascii):
(JSC::UString::operator=):
(JSC::UString::toStrictUInt32):
(JSC::equal):

• runtime/UString.h:

(JSC::UString::isEmpty):
(JSC::UString::cost):
(JSC::makeString):

• runtime/UStringImpl.cpp: Added.

(JSC::UStringImpl::baseSharedBuffer):
(JSC::UStringImpl::sharedBuffer):
(JSC::UStringImpl::destroy):
(JSC::UStringImpl::computeHash):

• runtime/UStringImpl.h: Added.

(JSC::UntypedPtrAndBitfield::UntypedPtrAndBitfield):
(JSC::UntypedPtrAndBitfield::asPtr):
(JSC::UntypedPtrAndBitfield::operator&=):
(JSC::UntypedPtrAndBitfield::operator|=):
(JSC::UntypedPtrAndBitfield::operator&):
(JSC::UStringImpl::create):
(JSC::UStringImpl::createCopying):
(JSC::UStringImpl::createUninitialized):
(JSC::UStringImpl::data):
(JSC::UStringImpl::size):
(JSC::UStringImpl::cost):
(JSC::UStringImpl::hash):
(JSC::UStringImpl::computedHash):
(JSC::UStringImpl::setHash):
(JSC::UStringImpl::identifierTable):
(JSC::UStringImpl::setIdentifierTable):
(JSC::UStringImpl::ref):
(JSC::UStringImpl::deref):
(JSC::UStringImpl::allocChars):
(JSC::UStringImpl::copyChars):
(JSC::UStringImpl::computeHash):
(JSC::UStringImpl::null):
(JSC::UStringImpl::empty):
(JSC::UStringImpl::checkConsistency):
(JSC::UStringImpl::):
(JSC::UStringImpl::UStringImpl):
(JSC::UStringImpl::operator new):
(JSC::UStringImpl::bufferOwnerString):
(JSC::UStringImpl::bufferOwnership):
(JSC::UStringImpl::isStatic):

JavaScriptGlue:

• ForwardingHeaders/wtf/PossiblyNull.h: Added.
  • add forwarding header.

WebCore:

• ForwardingHeaders/runtime/UStringImpl.h: Added.
  • add forwarding header.

• platform/text/StringImpl.cpp:

(WebCore::StringImpl::ustring):

• order of arguments to UString::Rep constructor for shared strings changed.

File:

• trunk/JavaScriptCore/runtime/JSString.cpp (modified) (3 diffs)

trunk/JavaScriptCore/runtime/JSString.cpp

@@ -97 +97 @@
     // Allocate the buffer to hold the final string, position initially points to the end.
     UChar* buffer;
-    if (!tryFastMalloc(m_stringLength * sizeof(UChar)).getValue(buffer)) {
+    m_value = UString::createUninitialized(m_stringLength, buffer);
+    if (!buffer) {
         for (unsigned i = 0; i < m_ropeLength; ++i)
             m_fibers[i].deref();
@@ -103 +104 @@
         ASSERT(!isRope());
         ASSERT(m_value == UString());
-
         throwOutOfMemoryError(exec);
         return;
@@ -134 +134 @@
                 // Create a string from the UChar buffer, clear the rope RefPtr.
                 ASSERT(buffer == position);
-                m_value = UString::Rep::create(buffer, m_stringLength);
                 for (unsigned i = 0; i < m_ropeLength; ++i)
                     m_fibers[i].deref();