Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1234845 part 9 - Remove callee slot from non-function interpreter frames. r=luke

Browse Source
This commit is contained in:
Jan de Mooij 2016-01-21 20:01:12 +01:00
parent 2af33cad3c
commit ed63d4de2a
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/src/vm/Stack.cpp
View File

@ -59,9 +59,8 @@ InterpreterFrame::initExecuteFrame(JSContext* cx, HandleScript script, AbstractF
}
}
Value* dstvp = (Value*)this - 2;
Value* dstvp = (Value*)this - 1;
dstvp[0] = newTarget;
dstvp[1] = NullValue(); //XXX remove, unused callee.
scopeChain_ = scopeChain.get();
prev_ = nullptr;
@ -404,8 +403,8 @@ InterpreterFrame::markValues(JSTracer* trc, Value* sp, jsbytecode* pc)
unsigned argc = Max(numActualArgs(), numFormalArgs());
TraceRootRange(trc, argc + isConstructing(), argv_, "fp argv");
} else {
// Mark callee and newTarget
TraceRootRange(trc, 2, ((Value*)this) - 2, "stack callee and newTarget");
// Mark newTarget.
TraceRoot(trc, ((Value*)this) - 1, "stack newTarget");
}
JSScript* script = this->script();
@ -487,12 +486,12 @@ InterpreterStack::pushExecuteFrame(JSContext* cx, HandleScript script, const Val
{
LifoAlloc::Mark mark = allocator_.mark();
unsigned nvars = 2 /* callee, newTarget */ + script->nslots();
unsigned nvars = 1 /* newTarget */ + script->nslots();
uint8_t* buffer = allocateFrame(cx, sizeof(InterpreterFrame) + nvars * sizeof(Value));
if (!buffer)
return nullptr;
InterpreterFrame* fp = reinterpret_cast<InterpreterFrame*>(buffer + 2 * sizeof(Value));
InterpreterFrame* fp = reinterpret_cast<InterpreterFrame*>(buffer + 1 * sizeof(Value));
fp->mark_ = mark;
fp->initExecuteFrame(cx, script, evalInFrame, newTargetValue, scopeChain, type);
fp->initLocals();

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

@ -670,7 +670,7 @@ class InterpreterFrame
*/
Value newTarget() const {
if (isEvalFrame())
return ((Value*)this)[-2];
return ((Value*)this)[-1];
MOZ_ASSERT(isFunctionFrame());