Changeset 38285 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 10, 2008, 7:51:24 PM (17 years ago)

Author:

[email protected]

Message:

2008-11-10 Maciej Stachowiak <​[email protected]>

Reviewed by Antti Koivisto.

• Make Vector::clear() release the Vector's memory (1MB savings on membuster) ​https://bugs.webkit.org/show_bug.cgi?id=22170

• wtf/Vector.h: (WTF::VectorBufferBase::deallocateBuffer): Set capacity to 0 as well as size, otherwise shrinking capacity to 0 can fail to reset the capacity and thus cause a future crash. (WTF::Vector::~Vector): Shrink size not capacity; we only need to call destructors, the buffer will be freed anyway. (WTF::Vector::clear): Change this to shrinkCapacity(0), not just shrink(0). (WTF::::shrinkCapacity): Use shrink() instead of resize() for case where the size is greater than the new capacity, to work with types that have no default constructor.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• wtf/Vector.h (modified) (4 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-11-10  Maciej Stachowiak  <[email protected]>
+
+        Reviewed by Antti Koivisto.
+        
+        - Make Vector::clear() release the Vector's memory (1MB savings on membuster)
+        https://bugs.webkit.org/show_bug.cgi?id=22170
+
+        * wtf/Vector.h:
+        (WTF::VectorBufferBase::deallocateBuffer): Set capacity to 0 as
+        well as size, otherwise shrinking capacity to 0 can fail to reset
+        the capacity and thus cause a future crash.
+        (WTF::Vector::~Vector): Shrink size not capacity; we only need
+        to call destructors, the buffer will be freed anyway.
+        (WTF::Vector::clear): Change this to shrinkCapacity(0), not just shrink(0).
+        (WTF::::shrinkCapacity): Use shrink() instead of resize() for case where
+        the size is greater than the new capacity, to work with types that have no
+        default constructor.
+
 2008-11-10  Cameron Zwarich  <[email protected]>
 

trunk/JavaScriptCore/wtf/Vector.h

@@ -280 +280 @@
         void deallocateBuffer(T* bufferToDeallocate)
         {
-            if (m_buffer == bufferToDeallocate)
+            if (m_buffer == bufferToDeallocate) {
                 m_buffer = 0;
+                m_capacity = 0;
+            }
             fastFree(bufferToDeallocate);
         }
@@ -443 +445 @@
         ~Vector()
         {
-            clear();
+            if (m_size) shrink(0);
         }
 
@@ -494 +496 @@
         void shrinkCapacity(size_t newCapacity);
 
-        void clear() { if (m_size) shrink(0); }
+        void clear() { shrinkCapacity(0); }
 
         template<typename U> void append(const U*, size_t);
@@ -726 +728 @@
             return;
 
-        resize(min(m_size, newCapacity));
+        if (newCapacity < size()) 
+            shrink(newCapacity);
 
         T* oldBuffer = begin();