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

nit fix for bug 558754 and remove bogus spot-fix that didn't have review (r=brendan)

Browse Source
This commit is contained in:
Andreas Gal
2010-05-12 13:12:53 -07:00
parent 607dcb9698
commit 2cfedd9bd7
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/jsiter.cpp
View File

@@ -170,6 +170,7 @@ Enumerate(JSContext *cx, JSObject *obj, jsid id, bool enumerable, uintN flags,
} }
if (flags & JSITER_FOREACH) { if (flags & JSITER_FOREACH) {
jsval *vp = vec.end() - 1; jsval *vp = vec.end() - 1;
if (!obj->getProperty(cx, id, vp)) if (!obj->getProperty(cx, id, vp))
return false; return false;
if (flags & JSITER_KEYVALUE && !NewKeyValuePair(cx, id, *vp, vp)) if (flags & JSITER_KEYVALUE && !NewKeyValuePair(cx, id, *vp, vp))

3
js/src/jstracer.cpp
View File

@@ -13662,9 +13662,6 @@ TraceRecorder::record_JSOP_ENDITER()
jsval& v = stackval(-1); jsval& v = stackval(-1);
JS_ASSERT(!JSVAL_IS_PRIMITIVE(v)); JS_ASSERT(!JSVAL_IS_PRIMITIVE(v));
if (JSVAL_TO_OBJECT(v)->getClass() == &js_GeneratorClass.base)
RETURN_STOP_A("can't trace ENDITER for generators");
enterDeepBailCall(); enterDeepBailCall();
LIns* args[] = { stack(-1), cx_ins }; LIns* args[] = { stack(-1), cx_ins };