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

Merge from mozilla-central (yay method barrier removal).

Browse Source
This commit is contained in:
David Anderson
2012-03-28 13:46:36 -07:00
parent 56a106bf03 9f97433030
commit d30e910b3f
297 changed files with 7762 additions and 5442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jsiter.cpp
View File

@@ -459,7 +459,7 @@ GetCustomIterator(JSContext *cx, JSObject *obj, unsigned flags, Value *vp)
/* Check whether we have a valid __iterator__ method. */
JSAtom *atom = cx->runtime->atomState.iteratorAtom;
if (!js_GetMethod(cx, obj, ATOM_TO_JSID(atom), JSGET_NO_METHOD_BARRIER, vp))
if (!js_GetMethod(cx, obj, ATOM_TO_JSID(atom), 0, vp))
return false;
/* If there is no custom __iterator__ method, we are done here. */
@@ -1251,7 +1251,7 @@ js_IteratorMore(JSContext *cx, JSObject *iterobj, Value *rval)
} else {
/* Call the iterator object's .next method. */
jsid id = ATOM_TO_JSID(cx->runtime->atomState.nextAtom);
if (!js_GetMethod(cx, iterobj, id, JSGET_METHOD_BARRIER, rval))
if (!js_GetMethod(cx, iterobj, id, 0, rval))
return false;
if (!Invoke(cx, ObjectValue(*iterobj), *rval, 0, NULL, rval)) {
/* Check for StopIteration. */