Changeset 40339 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Jan 28, 2009, 4:26:28 PM (16 years ago)

Author:

[email protected]

Message:

2009-01-28 Sam Weinig <​[email protected]>

Reviewed by Geoff Garen.

Initial patch by Mark Rowe.

<rdar://problem/6519356>
REGRESSION (r36006): "out of memory" alert running dromaeo on Windows

Report the cost of the ArrayStorage vector more accurately/often.

• runtime/JSArray.cpp: (JSC::JSArray::JSArray): Report the extra cost even for a filled array because JSString using the single character optimization and immediates wont increase the cost themselves. (JSC::JSArray::putSlowCase): Update the cost when increasing the size of the array. (JSC::JSArray::increaseVectorLength): Ditto.

File:

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

trunk/JavaScriptCore/runtime/JSArray.cpp

@@ -176 +176 @@
     m_storage = storage;
 
-    // When the array is created non-empty, its cells are filled, so it's really no worse than
-    // a property map. Therefore don't report extra memory cost.
+    Heap::heap(this)->reportExtraMemoryCost(storageSize(length));
 
     checkConsistency();
@@ -350 +349 @@
 
     unsigned vectorLength = storage->m_vectorLength;
+
+    Heap::heap(this)->reportExtraMemoryCost(storageSize(newVectorLength) - storageSize(vectorLength));
+
     if (newNumValuesInVector == storage->m_numValuesInVector + 1) {
         for (unsigned j = vectorLength; j < newVectorLength; ++j)
@@ -463 +465 @@
         return false;
 
+    Heap::heap(this)->reportExtraMemoryCost(storageSize(newVectorLength) - storageSize(vectorLength));
     storage->m_vectorLength = newVectorLength;