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

Backed out 2 changesets (bug 952873) for build bustage on a CLOSED TREE

Browse Source 
Backed out changeset 92dfed2592ae (bug 952873)
Backed out changeset 1ae58fcd61a9 (bug 952873)
This commit is contained in:
Wes Kocher
2014-01-28 17:34:42 -08:00
parent c4f0737ddf
commit 9dfecde59b
4 changed files with 40 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
js/src/jsiter.cpp
View File

@@ -15,7 +15,6 @@
#include "jsarray.h"
#include "jsatom.h"
#include "jscntxt.h"
#include "jsfriendapi.h"
#include "jsgc.h"
#include "jsobj.h"
#include "jsopcode.h"
@@ -40,7 +39,6 @@
using namespace js;
using namespace js::gc;
using JS::ForOfIterator;
using mozilla::ArrayLength;
#ifdef JS_MORE_DETERMINISTIC
@@ -1270,10 +1268,9 @@ const Class StopIterationObject::class_ = {
nullptr /* construct */
};
JS_FRIEND_API(bool)
ForOfIterator::init(HandleValue iterable, NonIterableBehavior nonIterableBehavior)
bool
ForOfIterator::init(HandleValue iterable)
{
JSContext *cx = cx_;
RootedObject iterableObj(cx, ToObject(cx, iterable));
if (!iterableObj)
return false;
@@ -1288,13 +1285,10 @@ ForOfIterator::init(HandleValue iterable, NonIterableBehavior nonIterableBehavio
if (!JSObject::getProperty(cx, iterableObj, iterableObj, cx->names().std_iterator, &callee))
return false;
// Throw if obj[@@iterator] isn't callable if we were asked to do so.
// js::Invoke is about to check for this kind of error anyway, but it would
// throw an inscrutable error message about |method| rather than this nice
// one about |obj|.
// Throw if obj[@@iterator] isn't callable. js::Invoke is about to check
// for this kind of error anyway, but it would throw an inscrutable
// error message about |method| rather than this nice one about |obj|.
if (!callee.isObject() || !callee.toObject().isCallable()) {
if (nonIterableBehavior == AllowNonIterable)
return true;
char *bytes = DecompileValueGenerator(cx, JSDVG_SEARCH_STACK, iterable, NullPtr());
if (!bytes)
return false;
@@ -1314,12 +1308,11 @@ ForOfIterator::init(HandleValue iterable, NonIterableBehavior nonIterableBehavio
return true;
}
JS_FRIEND_API(bool)
bool
ForOfIterator::next(MutableHandleValue vp, bool *done)
{
JS_ASSERT(iterator);
JSContext *cx = cx_;
RootedValue method(cx);
if (!JSObject::getProperty(cx, iterator, iterator, cx->names().next, &method))
return false;