Changeset 53323 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 14, 2010, 11:48:03 PM (15 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=33705
UStringImpl::create() should use internal storage

Reviewed by Oliver Hunt.

When creating a UStringImpl copying of a UChar*, we can use an internal buffer,
by calling UStringImpl::tryCreateUninitialized().

Also, remove duplicate of copyChars from JSString, call UStringImpl's version.

Small (max 0.5%) progression on Sunspidey.

• runtime/JSString.cpp:

(JSC::JSString::resolveRope):

• runtime/UStringImpl.h:

(JSC::UStringImpl::create):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSString.cpp (modified) (2 diffs)
• runtime/UStringImpl.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-01-14  Gavin Barraclough  <[email protected]>
+
+        Reviewed by Oliver Hunt.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33705
+        UStringImpl::create() should use internal storage
+
+        When creating a UStringImpl copying of a UChar*, we can use an internal buffer,
+        by calling UStringImpl::tryCreateUninitialized().
+
+        Also, remove duplicate of copyChars from JSString, call UStringImpl's version.
+
+        Small (max 0.5%) progression on Sunspidey.
+
+        * runtime/JSString.cpp:
+        (JSC::JSString::resolveRope):
+        * runtime/UStringImpl.h:
+        (JSC::UStringImpl::create):
+
 2010-01-14  Gavin Barraclough  <[email protected]>
 

trunk/JavaScriptCore/runtime/JSString.cpp

@@ -65 +65 @@
 {
     destructNonRecursive();
-}
-
-#define ROPE_COPY_CHARS_INLINE_CUTOFF 20
-
-static inline void copyChars(UChar* destination, const UChar* source, unsigned numCharacters)
-{
-#ifdef ROPE_COPY_CHARS_INLINE_CUTOFF
-    if (numCharacters <= ROPE_COPY_CHARS_INLINE_CUTOFF) {
-        for (unsigned i = 0; i < numCharacters; ++i)
-            destination[i] = source[i];
-        return;
-    }
-#endif
-    memcpy(destination, source, numCharacters * sizeof(UChar));
 }
 
@@ -129 +115 @@
             unsigned length = string->size();
             position -= length;
-            copyChars(position, string->data(), length);
+            UStringImpl::copyChars(position, string->data(), length);
 
             // Was this the last item in the work queue?

trunk/JavaScriptCore/runtime/UStringImpl.h

@@ -96 +96 @@
     {
         UChar* newBuffer;
-        if (!UStringImpl::allocChars(length).getValue(newBuffer))
-            return &null();
-        copyChars(newBuffer, buffer, length);
-        return adoptRef(new UStringImpl(newBuffer, length, BufferOwned));
+        if (PassRefPtr<UStringImpl> impl = tryCreateUninitialized(length, newBuffer)) {
+            copyChars(newBuffer, buffer, length);
+            return impl;
+        }
+        return &null();
     }
 
@@ -166 +167 @@
     UStringImpl* ref() { m_refCount += s_refCountIncrement; return this; }
     ALWAYS_INLINE void deref() { if (!(m_refCount -= s_refCountIncrement)) delete this; }
-
-    static WTF::PossiblyNull<UChar*> allocChars(size_t length)
-    {
-        ASSERT(length);
-        if (length > std::numeric_limits<size_t>::max() / sizeof(UChar))
-            return 0;
-        return tryFastMalloc(sizeof(UChar) * length);
-    }
 
     static void copyChars(UChar* destination, const UChar* source, unsigned numCharacters)