From 5c4f856ea3fc2b126f3423a6d78e57af43aae46b Mon Sep 17 00:00:00 2001
From: Andreas Gal <gal@mozilla.com>
Date: Thu, 8 Apr 2010 07:53:09 -0700
Subject: [PATCH] No need to lookup parent/proto for iterator objects, and
 cache the last free one (bug 558058, r=brendan).

---
 js/src/jscntxt.cpp |  2 ++
 js/src/jscntxt.h   |  6 ++++++
 js/src/jsiter.cpp  | 22 +++++++++++++---------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp
index d76fd6fc1dd2..f4a19ec2e123 100644
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -155,6 +155,8 @@ JSThreadData::mark(JSTracer *trc)
 void
 JSThreadData::purge(JSContext *cx)
 {
+    cachedIteratorObject = NULL;
+
     purgeGCFreeLists();
 
     js_PurgeGSNCache(&gsnCache);
diff --git a/js/src/jscntxt.h b/js/src/jscntxt.h
index 38175a5bca57..4d53a6fd3f30 100644
--- a/js/src/jscntxt.h
+++ b/js/src/jscntxt.h
@@ -567,6 +567,12 @@ struct JSThreadData {
 
     jsuword             nativeEnumCache[NATIVE_ENUM_CACHE_SIZE];
 
+    /*
+     * One-entry deep cache of iterator objects. We deposit here the last
+     * iterator that was freed in JSOP_ENDITER.
+     */
+    JSObject           *cachedIteratorObject;
+
     bool init();
     void finish();
     void mark(JSTracer *trc);
diff --git a/js/src/jsiter.cpp b/js/src/jsiter.cpp
index 9a7b03a0be11..d6ad56a535c7 100644
--- a/js/src/jsiter.cpp
+++ b/js/src/jsiter.cpp
@@ -391,16 +391,19 @@ js_ValueToIterator(JSContext *cx, uintN flags, jsval *vp)
         if (JSVAL_IS_VOID(*vp)) {
           default_iter:
             /*
-             * Fail over to the default enumerating native iterator.
-             *
-             * Create iterobj with a NULL parent to ensure that we use the
-             * correct scope chain to lookup the iterator's constructor. Since
-             * we use the parent slot to keep track of the iterable, we must
-             * fix it up after.
+             * Fail over to the default enumerating native iterator. These objects
+             * never escape, so we don't care for the proper parent or proto to
+             * be set. Furthermore we re-use the last cached iterator object, if
+             * possible.
              */
-            iterobj = js_NewObject(cx, &js_IteratorClass, NULL, NULL);
-            if (!iterobj)
-                return false;
+            iterobj = JS_THREAD_DATA(cx)->cachedIteratorObject;
+            if (iterobj) {
+                JS_THREAD_DATA(cx)->cachedIteratorObject = NULL;
+            } else {
+                iterobj = js_NewObjectWithGivenProto(cx, &js_IteratorClass, NULL, NULL);
+                if (!iterobj)
+                    return false;
+            }
 
             /* Store in *vp to protect it from GC (callers must root vp). */
             *vp = OBJECT_TO_JSVAL(iterobj);
@@ -434,6 +437,7 @@ js_CloseIterator(JSContext *cx, jsval v)
 
     if (clasp == &js_IteratorClass) {
         js_CloseNativeIterator(cx, obj);
+        JS_THREAD_DATA(cx)->cachedIteratorObject = obj;
     }
 #if JS_HAS_GENERATORS
     else if (clasp == &js_GeneratorClass) {