corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 61de331861af (bug 558058).

Browse Source
This commit is contained in:
Andreas Gal
2010-04-08 09:02:34 -07:00
parent 381a73bfdd
commit eb649a4fe7
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
js/src/jsiter.cpp
View File

@@ -391,19 +391,16 @@ js_ValueToIterator(JSContext *cx, uintN flags, jsval *vp)
if (JSVAL_IS_VOID(*vp)) {
default_iter:
/*
* 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.
* 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.
*/
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;
}
iterobj = js_NewObject(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);
@@ -437,7 +434,6 @@ 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) {