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

Bug 697322 - Add easier to use reset method to CallReceiver; r=luke

Browse Source 
All users of InvokeArgsGuard that use calleeHasBeenReset use it before
setting a new callee/this in a loop.  We should make it easier to use
by combining the reset with the setup with the setting of the new
callee.
This commit is contained in:
Terrence Cole
2011-11-08 10:17:25 -08:00
parent 118335bfe8
commit c8245d9d7c
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/jsarray.cpp
View File

@@ -2151,8 +2151,7 @@ sort_compare(void *arg, const void *a, const void *b, int *result)
if (!ag.pushed() && !cx->stack.pushInvokeArgs(cx, 2, &ag)) if (!ag.pushed() && !cx->stack.pushInvokeArgs(cx, 2, &ag))
return JS_FALSE; return JS_FALSE;
ag.calleeHasBeenReset(); ag.setCallee(ca->fval);
ag.calleev() = ca->fval;
ag.thisv() = UndefinedValue(); ag.thisv() = UndefinedValue();
ag[0] = *av; ag[0] = *av;
ag[1] = *bv; ag[1] = *bv;
@@ -3360,8 +3359,7 @@ array_readonlyCommon(JSContext *cx, CallArgs &args)
if (!kNotPresent) { if (!kNotPresent) {
if (!ag.pushed() && !cx->stack.pushInvokeArgs(cx, 3, &ag)) if (!ag.pushed() && !cx->stack.pushInvokeArgs(cx, 3, &ag))
return false; return false;
ag.calleeHasBeenReset(); ag.setCallee(ObjectValue(*callable));
ag.calleev() = ObjectValue(*callable);
ag.thisv() = thisv; ag.thisv() = thisv;
ag[0] = kValue; ag[0] = kValue;
ag[1] = NumberValue(k); ag[1] = NumberValue(k);
@@ -3462,8 +3460,7 @@ array_map(JSContext *cx, uintN argc, Value *vp)
if (!kNotPresent) { if (!kNotPresent) {
if (!ag.pushed() && !cx->stack.pushInvokeArgs(cx, 3, &ag)) if (!ag.pushed() && !cx->stack.pushInvokeArgs(cx, 3, &ag))
return false; return false;
ag.calleeHasBeenReset(); ag.setCallee(ObjectValue(*callable));
ag.calleev() = ObjectValue(*callable);
ag.thisv() = thisv; ag.thisv() = thisv;
ag[0] = kValue; ag[0] = kValue;
ag[1] = NumberValue(k); ag[1] = NumberValue(k);
@@ -3542,8 +3539,7 @@ array_filter(JSContext *cx, uintN argc, Value *vp)
if (!kNotPresent) { if (!kNotPresent) {
if (!ag.pushed() && !cx->stack.pushInvokeArgs(cx, 3, &ag)) if (!ag.pushed() && !cx->stack.pushInvokeArgs(cx, 3, &ag))
return false; return false;
ag.calleeHasBeenReset(); ag.setCallee(ObjectValue(*callable));
ag.calleev() = ObjectValue(*callable);
ag.thisv() = thisv; ag.thisv() = thisv;
ag[0] = kValue; ag[0] = kValue;
ag[1] = NumberValue(k); ag[1] = NumberValue(k);
@@ -3661,8 +3657,7 @@ array_reduceCommon(JSContext *cx, CallArgs &args)
if (!kNotPresent) { if (!kNotPresent) {
if (!ag.pushed() && !cx->stack.pushInvokeArgs(cx, 4, &ag)) if (!ag.pushed() && !cx->stack.pushInvokeArgs(cx, 4, &ag))
return false; return false;
ag.calleeHasBeenReset(); ag.setCallee(ObjectValue(*callable));
ag.calleev() = ObjectValue(*callable);
ag.thisv() = UndefinedValue(); ag.thisv() = UndefinedValue();
ag[0] = accumulator; ag[0] = accumulator;
ag[1] = kValue; ag[1] = kValue;

3
js/src/jsstr.cpp
View File

@@ -1791,8 +1791,7 @@ FindReplaceLength(JSContext *cx, RegExpStatics *res, ReplaceData &rdata, size_t
if (!args.pushed() && !cx->stack.pushInvokeArgs(cx, argc, &args)) if (!args.pushed() && !cx->stack.pushInvokeArgs(cx, argc, &args))
return false; return false;
args.calleeHasBeenReset(); args.setCallee(ObjectValue(*lambda));
args.calleev() = ObjectValue(*lambda);
args.thisv() = UndefinedValue(); args.thisv() = UndefinedValue();
/* Push $&, $1, $2, ... */ /* Push $&, $1, $2, ... */

3
js/src/vm/Stack.h
View File

@@ -208,8 +208,9 @@ class CallReceiver
return argv_ - 1; return argv_ - 1;
} }
void calleeHasBeenReset() const { void setCallee(Value calleev) {
clearUsedRval(); clearUsedRval();
this->calleev() = calleev;
} }
}; };