Changeset 91288 in webkit

Timestamp:

Jul 19, 2011 12:49:07 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

[JSC] WebKit allocates gigabytes of memory when doing repeated string concatenation
​https://bugs.webkit.org/show_bug.cgi?id=63918

Patch by Mark Hahnenberg <​mhahnenberg@apple.com> on 2011-07-19
Reviewed by Darin Adler.

When allocating JSStrings during concatenation, we needed to call the Heap's reportExtraMemoryCost
method due to additional string copying within several of the constructors when dealing with
UStrings. This has been added to the UString version of the appendStringInConstruct method
within the JSString class.

• runtime/JSString.h:

(JSC::RopeBuilder::JSString):
(JSC::RopeBuilder::appendStringInConstruct):

Location:

trunk/Source/JavaScriptCore

Files:

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

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-07-19  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        [JSC] WebKit allocates gigabytes of memory when doing repeated string concatenation
+        https://bugs.webkit.org/show_bug.cgi?id=63918
+
+        Reviewed by Darin Adler.
+
+        When allocating JSStrings during concatenation, we needed to call the Heap's reportExtraMemoryCost
+        method due to additional string copying within several of the constructors when dealing with 
+        UStrings.  This has been added to the UString version of the appendStringInConstruct method 
+        within the JSString class.
+
+        * runtime/JSString.h:
+        (JSC::RopeBuilder::JSString):
+        (JSC::RopeBuilder::appendStringInConstruct):
+
 2011-07-19  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -201 +201 @@
         {
             ASSERT(!m_value.isNull());
+            Heap::heap(this)->reportExtraMemoryCost(value.impl()->cost());
         }
         JSString(JSGlobalData& globalData, PassRefPtr<StringImpl> value, HasOtherOwnerType)
@@ -394 +395 @@
             impl->ref();
             m_fibers[index++] = impl;
+            Heap::heap(this)->reportExtraMemoryCost(string.impl()->cost());
         }