Changeset 31807 in webkit for trunk/JavaScriptCore/kjs/JSGlobalObject.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/kjs/JSGlobalObject.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -138 +138 @@
             ActivationStackNode* activations;
             size_t activationCount;
+
+            OwnPtr<HashSet<JSObject*> > arrayVisitedElements; // Global data shared by array prototype functions.
         };
 
@@ -242 +244 @@
         ExecStateStack& activeExecStates() const { return d()->activeExecStates; }
 
+        HashSet<JSObject*>& arrayVisitedElements() { if (!d()->arrayVisitedElements) d()->arrayVisitedElements.set(new HashSet<JSObject*>); return *d()->arrayVisitedElements; }
+
     private:
         void init();