Changeset 31807 in webkit for trunk/JavaScriptCore/wtf/Vector.h

Timestamp:

Apr 11, 2008, 12:37:33 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff.

​https://bugs.webkit.org/show_bug.cgi?id=18402
REGRESSION: visited element handling is incorrect in nested join/toString calls

No change on SunSpider total, possibly a tiny improvement (about 0.1%).

Test: fast/js/array-tostring-and-join.html

• kjs/JSGlobalObject.h: (KJS::JSGlobalObject::visitedElements): Store visited elements HashSet here, making it common to toString/toLocalizedString/join again.

• kjs/array_object.cpp: (KJS::arrayProtoFuncToString): (KJS::arrayProtoFuncToLocaleString): (KJS::arrayProtoFuncJoin): Got rid of static variables. Replaced UString with Vector to avoid O(n^{2) behavior and regain performance.}

• wtf/Vector.h: (WTF::::resize): (WTF::::grow): (WTF::::reserveCapacity): (WTF::::append): (WTF::::insert): Added null checks, so that Vector methods don't crash when out of memory. The caller should check that data pointer is not null before proceeding.

File:

• trunk/JavaScriptCore/wtf/Vector.h (modified) (7 diffs)

trunk/JavaScriptCore/wtf/Vector.h

@@ -629 +629 @@
             if (size > capacity())
                 expandCapacity(size);
-            TypeOperations::initialize(end(), begin() + size);
+            if (begin())
+                TypeOperations::initialize(end(), begin() + size);
         }
         
@@ -649 +650 @@
         if (size > capacity())
             expandCapacity(size);
-        TypeOperations::initialize(end(), begin() + size);
+        if (begin())
+            TypeOperations::initialize(end(), begin() + size);
         m_size = size;
     }
@@ -661 +663 @@
         T* oldEnd = end();
         m_buffer.allocateBuffer(newCapacity);
-        TypeOperations::move(oldBuffer, oldEnd, begin());
+        if (begin())
+            TypeOperations::move(oldBuffer, oldEnd, begin());
         m_buffer.deallocateBuffer(oldBuffer);
     }
@@ -692 +695 @@
     {
         size_t newSize = m_size + dataSize;
-        if (newSize > capacity())
+        if (newSize > capacity()) {
             data = expandCapacity(newSize, data);
+            if (!begin())
+                return;
+        }
         T* dest = end();
         for (size_t i = 0; i < dataSize; ++i)
@@ -704 +710 @@
     {
         const U* ptr = &val;
-        if (size() == capacity())
+        if (size() == capacity()) {
             ptr = expandCapacity(size() + 1, ptr);
+            if (!begin())
+                return;
+        }
             
 #if COMPILER(MSVC7)
@@ -744 +753 @@
         ASSERT(position <= size());
         size_t newSize = m_size + dataSize;
-        if (newSize > capacity())
+        if (newSize > capacity()) {
             data = expandCapacity(newSize, data);
+            if (!begin())
+                return;
+        }
         T* spot = begin() + position;
         TypeOperations::moveOverlapping(spot, end(), spot + dataSize);
@@ -758 +770 @@
         ASSERT(position <= size());
         const U* data = &val;
-        if (size() == capacity())
+        if (size() == capacity()) {
             data = expandCapacity(size() + 1, data);
+            if (!begin())
+                return;
+        }
         T* spot = begin() + position;
         TypeOperations::moveOverlapping(spot, end(), spot + 1);