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

Bug 1535994 - Part 4: Move stackDepth to BytecodeSection class. r=jorendorff

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D25734

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Tooru Fujisawa 2019-04-10 08:26:50 +00:00
parent ab72ae8652
commit 9a7b29f0cf
13 changed files with 103 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/frontend/BytecodeControlStructures.cpp
View File

@ -41,7 +41,7 @@ LoopControl::LoopControl(BytecodeEmitter* bce, StatementKind loopKind)
LoopControl* enclosingLoop = findNearest<LoopControl>(enclosing());
stackDepth_ = bce->stackDepth;
stackDepth_ = bce->bytecodeSection().stackDepth();
loopDepth_ = enclosingLoop ? enclosingLoop->loopDepth_ + 1 : 1;
int loopSlots;
@ -81,7 +81,7 @@ bool LoopControl::emitContinueTarget(BytecodeEmitter* bce) {
bool LoopControl::emitSpecialBreakForDone(BytecodeEmitter* bce) {
// This doesn't pop stack values, nor handle any other controls.
// Should be called on the toplevel of the loop.
MOZ_ASSERT(bce->stackDepth == stackDepth_);
MOZ_ASSERT(bce->bytecodeSection().stackDepth() == stackDepth_);
MOZ_ASSERT(bce->innermostNestableControl == this);
if (!bce->newSrcNote(SRC_BREAK)) {

98
js/src/frontend/BytecodeEmitter.cpp
View File

@ -247,18 +247,18 @@ bool BytecodeEmitter::emitCheck(JSOp op, ptrdiff_t delta, ptrdiff_t* offset) {
return true;
}
void BytecodeEmitter::updateDepth(ptrdiff_t target) {
jsbytecode* pc = bytecodeSection().code(target);
void BytecodeEmitter::BytecodeSection::updateDepth(ptrdiff_t target) {
jsbytecode* pc = code(target);
int nuses = StackUses(pc);
int ndefs = StackDefs(pc);
stackDepth -= nuses;
MOZ_ASSERT(stackDepth >= 0);
stackDepth += ndefs;
stackDepth_ -= nuses;
MOZ_ASSERT(stackDepth_ >= 0);
stackDepth_ += ndefs;
if ((uint32_t)stackDepth > maxStackDepth) {
maxStackDepth = stackDepth;
if ((uint32_t)stackDepth_ > maxStackDepth_) {
maxStackDepth_ = stackDepth_;
}
}
@ -284,7 +284,7 @@ bool BytecodeEmitter::emit1(JSOp op) {
jsbytecode* code = bytecodeSection().code(offset);
code[0] = jsbytecode(op);
updateDepth(offset);
bytecodeSection().updateDepth(offset);
return true;
}
@ -299,7 +299,7 @@ bool BytecodeEmitter::emit2(JSOp op, uint8_t op1) {
jsbytecode* code = bytecodeSection().code(offset);
code[0] = jsbytecode(op);
code[1] = jsbytecode(op1);
updateDepth(offset);
bytecodeSection().updateDepth(offset);
return true;
}
@ -319,7 +319,7 @@ bool BytecodeEmitter::emit3(JSOp op, jsbytecode op1, jsbytecode op2) {
code[0] = jsbytecode(op);
code[1] = op1;
code[2] = op2;
updateDepth(offset);
bytecodeSection().updateDepth(offset);
return true;
}
@ -341,7 +341,7 @@ bool BytecodeEmitter::emitN(JSOp op, size_t extra, ptrdiff_t* offset) {
* operand yet to be stored in the extra bytes after op.
*/
if (CodeSpec[op].nuses >= 0) {
updateDepth(off);
bytecodeSection().updateDepth(off);
}
if (offset) {
@ -394,7 +394,7 @@ bool BytecodeEmitter::emitJumpNoFallthrough(JSOp op, JumpList* jump) {
code[0] = jsbytecode(op);
MOZ_ASSERT(-1 <= jump->offset && jump->offset < offset);
jump->push(bytecodeSection().code(0), offset);
updateDepth(offset);
bytecodeSection().updateDepth(offset);
return true;
}
@ -463,7 +463,7 @@ bool BytecodeEmitter::emitCall(JSOp op, uint16_t argc, ParseNode* pn) {
}
bool BytecodeEmitter::emitDupAt(unsigned slotFromTop) {
MOZ_ASSERT(slotFromTop < unsigned(stackDepth));
MOZ_ASSERT(slotFromTop < unsigned(bytecodeSection().stackDepth()));
if (slotFromTop == 0) {
return emit1(JSOP_DUP);
@ -669,7 +669,7 @@ class NonLocalExitControl {
NonLocalExitControl(BytecodeEmitter* bce, Kind kind)
: bce_(bce),
savedScopeNoteIndex_(bce->scopeNoteList.length()),
savedDepth_(bce->stackDepth),
savedDepth_(bce->bytecodeSection().stackDepth()),
openScopeNoteIndex_(bce->innermostEmitterScope()->noteIndex()),
kind_(kind) {}
@ -678,7 +678,7 @@ class NonLocalExitControl {
n++) {
bce_->scopeNoteList.recordEnd(n, bce_->bytecodeSection().offset());
}
bce_->stackDepth = savedDepth_;
bce_->bytecodeSection().setStackDepth(savedDepth_);
}
MOZ_MUST_USE bool prepareForNonLocalJump(NestableControl* target);
@ -893,7 +893,7 @@ bool BytecodeEmitter::emitIndex32(JSOp op, uint32_t index) {
jsbytecode* code = bytecodeSection().code(offset);
code[0] = jsbytecode(op);
SET_UINT32_INDEX(code, index);
updateDepth(offset);
bytecodeSection().updateDepth(offset);
return true;
}
@ -911,7 +911,7 @@ bool BytecodeEmitter::emitIndexOp(JSOp op, uint32_t index) {
jsbytecode* code = bytecodeSection().code(offset);
code[0] = jsbytecode(op);
SET_UINT32_INDEX(code, index);
updateDepth(offset);
bytecodeSection().updateDepth(offset);
return true;
}
@ -1692,7 +1692,7 @@ bool BytecodeEmitter::emitNewInit() {
code[2] = 0;
code[3] = 0;
code[4] = 0;
updateDepth(offset);
bytecodeSection().updateDepth(offset);
return true;
}
@ -2575,7 +2575,7 @@ bool BytecodeEmitter::emitDestructuringLHSRef(ParseNode* target,
}
#ifdef DEBUG
int depth = stackDepth;
int depth = bytecodeSection().stackDepth();
#endif
switch (target->getKind()) {
@ -2653,7 +2653,7 @@ bool BytecodeEmitter::emitDestructuringLHSRef(ParseNode* target,
MOZ_CRASH("emitDestructuringLHSRef: bad lhs kind");
}
MOZ_ASSERT(stackDepth == depth + int(*emitted));
MOZ_ASSERT(bytecodeSection().stackDepth() == depth + int(*emitted));
return true;
}
@ -2816,7 +2816,7 @@ bool BytecodeEmitter::emitIteratorNext(
"can run user-modifiable iteration code");
// [stack] ... NEXT ITER
MOZ_ASSERT(this->stackDepth >= 2);
MOZ_ASSERT(bytecodeSection().stackDepth() >= 2);
if (!emitCall(JSOP_CALL, 0, callSourceCoordOffset)) {
// [stack] ... RESULT
@ -2839,7 +2839,7 @@ bool BytecodeEmitter::emitIteratorNext(
bool BytecodeEmitter::emitPushNotUndefinedOrNull() {
// [stack] V
MOZ_ASSERT(this->stackDepth > 0);
MOZ_ASSERT(bytecodeSection().stackDepth() > 0);
if (!emit1(JSOP_DUP)) {
// [stack] V V
@ -3087,7 +3087,7 @@ bool BytecodeEmitter::emitIteratorCloseInScope(
template <typename InnerEmitter>
bool BytecodeEmitter::wrapWithDestructuringTryNote(int32_t iterDepth,
InnerEmitter emitter) {
MOZ_ASSERT(this->stackDepth >= iterDepth);
MOZ_ASSERT(bytecodeSection().stackDepth() >= iterDepth);
// Pad a nop at the beginning of the bytecode covered by the trynote so
// that when unwinding environments, we may unwind to the scope
@ -3208,7 +3208,7 @@ bool BytecodeEmitter::emitInitializer(ParseNode* initializer,
bool BytecodeEmitter::emitDestructuringOpsArray(ListNode* pattern,
DestructuringFlavor flav) {
MOZ_ASSERT(pattern->isKind(ParseNodeKind::ArrayExpr));
MOZ_ASSERT(this->stackDepth != 0);
MOZ_ASSERT(bytecodeSection().stackDepth() != 0);
// Here's pseudo code for |let [a, b, , c=y, ...d] = x;|
//
@ -3332,7 +3332,7 @@ bool BytecodeEmitter::emitDestructuringOpsArray(ListNode* pattern,
// JSTRY_DESTRUCTURING expects the iterator and the done value
// to be the second to top and the top of the stack, respectively.
// IteratorClose is called upon exception only if done is false.
int32_t tryNoteDepth = stackDepth;
int32_t tryNoteDepth = bytecodeSection().stackDepth();
for (ParseNode* member : pattern->contents()) {
bool isFirst = member == pattern->head();
@ -3641,7 +3641,7 @@ bool BytecodeEmitter::emitDestructuringOpsObject(ListNode* pattern,
MOZ_ASSERT(pattern->isKind(ParseNodeKind::ObjectExpr));
// [stack] ... RHS
MOZ_ASSERT(this->stackDepth > 0);
MOZ_ASSERT(bytecodeSection().stackDepth() > 0);
if (!emit1(JSOP_CHECKOBJCOERCIBLE)) {
// [stack] ... RHS
@ -4905,7 +4905,7 @@ bool BytecodeEmitter::emitWith(BinaryNode* withNode) {
}
bool BytecodeEmitter::emitCopyDataProperties(CopyOption option) {
DebugOnly<int32_t> depth = this->stackDepth;
DebugOnly<int32_t> depth = bytecodeSection().stackDepth();
uint32_t argc;
if (option == CopyOption::Filtered) {
@ -4960,7 +4960,7 @@ bool BytecodeEmitter::emitCopyDataProperties(CopyOption option) {
return false;
}
MOZ_ASSERT(depth - int(argc) == this->stackDepth);
MOZ_ASSERT(depth - int(argc) == bytecodeSection().stackDepth());
return true;
}
@ -5151,11 +5151,11 @@ bool BytecodeEmitter::emitSpread(bool allowSelfHosted) {
// when we reach this point on the loop backedge (if spreading produces at
// least one value), we've additionally pushed a RESULT iteration value.
// Increment manually to reflect this.
this->stackDepth++;
bytecodeSection().setStackDepth(bytecodeSection().stackDepth() + 1);
{
#ifdef DEBUG
auto loopDepth = this->stackDepth;
auto loopDepth = bytecodeSection().stackDepth();
#endif
// Emit code to assign result.value to the iteration variable.
@ -5168,7 +5168,7 @@ bool BytecodeEmitter::emitSpread(bool allowSelfHosted) {
return false;
}
MOZ_ASSERT(this->stackDepth == loopDepth - 1);
MOZ_ASSERT(bytecodeSection().stackDepth() == loopDepth - 1);
// Spread operations can't contain |continue|, so don't bother setting loop
// and enclosing "update" offsets, as we do with for-loops.
@ -5205,7 +5205,7 @@ bool BytecodeEmitter::emitSpread(bool allowSelfHosted) {
return false;
}
MOZ_ASSERT(this->stackDepth == loopDepth);
MOZ_ASSERT(bytecodeSection().stackDepth() == loopDepth);
}
// Let Ion know where the closing jump of this loop is.
@ -5218,8 +5218,8 @@ bool BytecodeEmitter::emitSpread(bool allowSelfHosted) {
MOZ_ASSERT(loopInfo.breaks.offset == -1);
MOZ_ASSERT(loopInfo.continues.offset == -1);
if (!addTryNote(JSTRY_FOR_OF, stackDepth, loopInfo.headOffset(),
loopInfo.breakTargetOffset())) {
if (!addTryNote(JSTRY_FOR_OF, bytecodeSection().stackDepth(),
loopInfo.headOffset(), loopInfo.breakTargetOffset())) {
return false;
}
@ -5240,7 +5240,7 @@ bool BytecodeEmitter::emitInitializeForInOrOfTarget(TernaryNode* forHead) {
MOZ_ASSERT(forHead->isKind(ParseNodeKind::ForIn) ||
forHead->isKind(ParseNodeKind::ForOf));
MOZ_ASSERT(this->stackDepth >= 1,
MOZ_ASSERT(bytecodeSection().stackDepth() >= 1,
"must have a per-iteration value for initializing");
ParseNode* target = forHead->kid1();
@ -5288,14 +5288,14 @@ bool BytecodeEmitter::emitInitializeForInOrOfTarget(TernaryNode* forHead) {
// iteration value *before* initializing. Thus the initializing
// value may be buried under a bind-specific value on the stack.
// Swap it to the top of the stack.
MOZ_ASSERT(stackDepth >= 2);
MOZ_ASSERT(bytecodeSection().stackDepth() >= 2);
if (!emit1(JSOP_SWAP)) {
return false;
}
} else {
// In cases of emitting a frame slot or environment slot,
// nothing needs be done.
MOZ_ASSERT(stackDepth >= 1);
MOZ_ASSERT(bytecodeSection().stackDepth() >= 1);
}
if (!noe.emitAssignment()) {
return false;
@ -6220,7 +6220,7 @@ bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
}
int32_t savedDepthTemp;
int32_t startDepth = stackDepth;
int32_t startDepth = bytecodeSection().stackDepth();
MOZ_ASSERT(startDepth >= 3);
TryEmitter tryCatch(this, TryEmitter::Kind::TryCatchFinally,
@ -6252,7 +6252,7 @@ bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
return false;
}
MOZ_ASSERT(this->stackDepth == startDepth);
MOZ_ASSERT(bytecodeSection().stackDepth() == startDepth);
// Step 7.a.vi.
// Step 7.b.ii.7.
@ -6285,7 +6285,7 @@ bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
return false;
}
MOZ_ASSERT(stackDepth == startDepth);
MOZ_ASSERT(bytecodeSection().stackDepth() == startDepth);
if (!emit1(JSOP_EXCEPTION)) {
// [stack] NEXT ITER RESULT EXCEPTION
@ -6304,7 +6304,7 @@ bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
return false;
}
savedDepthTemp = stackDepth;
savedDepthTemp = bytecodeSection().stackDepth();
InternalIfEmitter ifThrowMethodIsNotDefined(this);
if (!emitPushNotUndefinedOrNull()) {
// [stack] NEXT ITER RESULT EXCEPTION ITER THROW
@ -6355,7 +6355,7 @@ bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
// [stack] NEXT ITER RESULT
return false;
}
MOZ_ASSERT(this->stackDepth == startDepth);
MOZ_ASSERT(bytecodeSection().stackDepth() == startDepth);
JumpList checkResult;
// Note that there is no GOSUB to the finally block here. If the iterator has
@ -6366,7 +6366,7 @@ bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
return false;
}
stackDepth = savedDepthTemp;
bytecodeSection().setStackDepth(savedDepthTemp);
if (!ifThrowMethodIsNotDefined.emitElse()) {
// [stack] NEXT ITER RESULT EXCEPTION ITER THROW
return false;
@ -6391,12 +6391,12 @@ bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
return false;
}
stackDepth = savedDepthTemp;
bytecodeSection().setStackDepth(savedDepthTemp);
if (!ifThrowMethodIsNotDefined.emitEnd()) {
return false;
}
stackDepth = startDepth;
bytecodeSection().setStackDepth(startDepth);
if (!tryCatch.emitFinally()) {
return false;
}
@ -6523,7 +6523,7 @@ bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
// [stack] NEXT ITER OLDRESULT FTYPE FVALUE
return false;
}
savedDepthTemp = this->stackDepth;
savedDepthTemp = bytecodeSection().stackDepth();
if (!ifReturnDone.emitElse()) {
// [stack] NEXT ITER OLDRESULT FTYPE FVALUE RESULT
return false;
@ -6545,7 +6545,7 @@ bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
return false;
}
}
this->stackDepth = savedDepthTemp;
bytecodeSection().setStackDepth(savedDepthTemp);
if (!ifReturnDone.emitEnd()) {
return false;
}
@ -6620,7 +6620,7 @@ bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
// [stack] NEXT ITER RESULT
return false;
}
MOZ_ASSERT(this->stackDepth == startDepth);
MOZ_ASSERT(bytecodeSection().stackDepth() == startDepth);
// Steps 7.a.iv-v.
// Steps 7.b.ii.5-6.
@ -6665,7 +6665,7 @@ bool BytecodeEmitter::emitYieldStar(ParseNode* iter) {
return false;
}
MOZ_ASSERT(this->stackDepth == startDepth - 2);
MOZ_ASSERT(bytecodeSection().stackDepth() == startDepth - 2);
return true;
}

22
js/src/frontend/BytecodeEmitter.h
View File

@ -164,6 +164,15 @@ struct MOZ_STACK_CLASS BytecodeEmitter {
return lastOpcodeIsJumpTarget() ? lastTarget_.offset : offset();
}
// ---- Stack ----
int32_t stackDepth() const { return stackDepth_; }
void setStackDepth(int32_t depth) { stackDepth_ = depth; }
uint32_t maxStackDepth() const { return maxStackDepth_; }
void updateDepth(ptrdiff_t target);
private:
// ---- Bytecode ----
@ -182,6 +191,14 @@ struct MOZ_STACK_CLASS BytecodeEmitter {
// Last jump target emitted.
JumpTarget lastTarget_ = {-1 - ptrdiff_t(JSOP_JUMPTARGET_LENGTH)};
// ---- Stack ----
// Maximum number of expression stack slots so far.
uint32_t maxStackDepth_ = 0;
// Current stack depth in script frame.
int32_t stackDepth_ = 0;
};
BytecodeSection bytecodeSection_;
@ -224,10 +241,6 @@ struct MOZ_STACK_CLASS BytecodeEmitter {
unsigned firstLine = 0; /* first line, for JSScript::initFromEmitter */
uint32_t maxFixedSlots = 0; /* maximum number of fixed frame slots so far */
uint32_t maxStackDepth =
0; /* maximum number of expression stack slots so far */
int32_t stackDepth = 0; /* current stack depth in script frame */
uint32_t bodyScopeIndex =
UINT32_MAX; /* index into scopeList of the body scope */
@ -542,7 +555,6 @@ struct MOZ_STACK_CLASS BytecodeEmitter {
MOZ_MUST_USE bool emitFunctionScript(FunctionNode* funNode,
TopLevelFunction isTopLevel);
void updateDepth(ptrdiff_t target);
MOZ_MUST_USE bool markStepBreakpoint();
MOZ_MUST_USE bool markSimpleBreakpoint();
MOZ_MUST_USE bool updateLineNumberNotes(uint32_t offset);

3
js/src/frontend/CForEmitter.cpp
View File

@ -228,7 +228,8 @@ bool CForEmitter::emitEnd() {
return false;
}
if (!bce_->addTryNote(JSTRY_LOOP, bce_->stackDepth, loopInfo_->headOffset(),
if (!bce_->addTryNote(JSTRY_LOOP, bce_->bytecodeSection().stackDepth(),
loopInfo_->headOffset(),
loopInfo_->breakTargetOffset())) {
return false;
}

3
js/src/frontend/DoWhileEmitter.cpp
View File

@ -75,7 +75,8 @@ bool DoWhileEmitter::emitEnd() {
return false;
}
if (!bce_->addTryNote(JSTRY_LOOP, bce_->stackDepth, loopInfo_->headOffset(),
if (!bce_->addTryNote(JSTRY_LOOP, bce_->bytecodeSection().stackDepth(),
loopInfo_->headOffset(),
loopInfo_->breakTargetOffset())) {
return false;
}

4
js/src/frontend/ExpressionStatementEmitter.cpp
View File

@ -29,7 +29,7 @@ bool ExpressionStatementEmitter::prepareForExpr(
}
#ifdef DEBUG
depth_ = bce_->stackDepth;
depth_ = bce_->bytecodeSection().stackDepth();
state_ = State::Expr;
#endif
return true;
@ -37,7 +37,7 @@ bool ExpressionStatementEmitter::prepareForExpr(
bool ExpressionStatementEmitter::emitEnd() {
MOZ_ASSERT(state_ == State::Expr);
MOZ_ASSERT(bce_->stackDepth == depth_ + 1);
MOZ_ASSERT(bce_->bytecodeSection().stackDepth() == depth_ + 1);
// [stack] VAL

7
js/src/frontend/ForInEmitter.cpp
View File

@ -94,7 +94,7 @@ bool ForInEmitter::emitInitialize() {
}
#ifdef DEBUG
loopDepth_ = bce_->stackDepth;
loopDepth_ = bce_->bytecodeSection().stackDepth();
#endif
MOZ_ASSERT(loopDepth_ >= 2);
@ -112,7 +112,7 @@ bool ForInEmitter::emitInitialize() {
bool ForInEmitter::emitBody() {
MOZ_ASSERT(state_ == State::Initialize);
MOZ_ASSERT(bce_->stackDepth == loopDepth_,
MOZ_ASSERT(bce_->bytecodeSection().stackDepth() == loopDepth_,
"iterator and iterval must be left on the stack");
#ifdef DEBUG
@ -171,7 +171,8 @@ bool ForInEmitter::emitEnd(const Maybe<uint32_t>& forPos) {
return false;
}
if (!bce_->addTryNote(JSTRY_FOR_IN, bce_->stackDepth, loopInfo_->headOffset(),
if (!bce_->addTryNote(JSTRY_FOR_IN, bce_->bytecodeSection().stackDepth(),
loopInfo_->headOffset(),
bce_->bytecodeSection().offset())) {
return false;
}

13
js/src/frontend/ForOfEmitter.cpp
View File

@ -58,7 +58,7 @@ bool ForOfEmitter::emitInitialize(const Maybe<uint32_t>& forPos) {
}
}
int32_t iterDepth = bce_->stackDepth;
int32_t iterDepth = bce_->bytecodeSection().stackDepth();
// For-of loops have the iterator next method, the iterator itself, and
// the result.value on the stack.
@ -111,7 +111,7 @@ bool ForOfEmitter::emitInitialize(const Maybe<uint32_t>& forPos) {
}
#ifdef DEBUG
loopDepth_ = bce_->stackDepth;
loopDepth_ = bce_->bytecodeSection().stackDepth();
#endif
// Make sure this code is attributed to the "for".
@ -195,7 +195,7 @@ bool ForOfEmitter::emitInitialize(const Maybe<uint32_t>& forPos) {
bool ForOfEmitter::emitBody() {
MOZ_ASSERT(state_ == State::Initialize);
MOZ_ASSERT(bce_->stackDepth == loopDepth_,
MOZ_ASSERT(bce_->bytecodeSection().stackDepth() == loopDepth_,
"the stack must be balanced around the initializing "
"operation");
@ -218,7 +218,7 @@ bool ForOfEmitter::emitBody() {
bool ForOfEmitter::emitEnd(const Maybe<uint32_t>& iteratedPos) {
MOZ_ASSERT(state_ == State::Body);
MOZ_ASSERT(bce_->stackDepth == loopDepth_,
MOZ_ASSERT(bce_->bytecodeSection().stackDepth() == loopDepth_,
"the stack must be balanced around the for-of body");
if (!loopInfo_->emitEndCodeNeedingIteratorClose(bce_)) {
@ -244,7 +244,7 @@ bool ForOfEmitter::emitEnd(const Maybe<uint32_t>& iteratedPos) {
return false;
}
MOZ_ASSERT(bce_->stackDepth == loopDepth_);
MOZ_ASSERT(bce_->bytecodeSection().stackDepth() == loopDepth_);
// Let Ion know where the closing jump of this loop is.
if (!bce_->setSrcNoteOffset(noteIndex_, SrcNote::ForOf::BackJumpOffset,
@ -256,7 +256,8 @@ bool ForOfEmitter::emitEnd(const Maybe<uint32_t>& iteratedPos) {
return false;
}
if (!bce_->addTryNote(JSTRY_FOR_OF, bce_->stackDepth, loopInfo_->headOffset(),
if (!bce_->addTryNote(JSTRY_FOR_OF, bce_->bytecodeSection().stackDepth(),
loopInfo_->headOffset(),
loopInfo_->breakTargetOffset())) {
return false;
}

5
js/src/frontend/ForOfLoopControl.cpp
View File

@ -45,7 +45,7 @@ bool ForOfLoopControl::emitEndCodeNeedingIteratorClose(BytecodeEmitter* bce) {
// [stack] ITER ... EXCEPTION
return false;
}
unsigned slotFromTop = bce->stackDepth - iterDepth_;
unsigned slotFromTop = bce->bytecodeSection().stackDepth() - iterDepth_;
if (!bce->emitDupAt(slotFromTop)) {
// [stack] ITER ... EXCEPTION ITER
return false;
@ -69,7 +69,8 @@ bool ForOfLoopControl::emitEndCodeNeedingIteratorClose(BytecodeEmitter* bce) {
return false;
}
MOZ_ASSERT(slotFromTop == unsigned(bce->stackDepth - iterDepth_));
MOZ_ASSERT(slotFromTop ==
unsigned(bce->bytecodeSection().stackDepth() - iterDepth_));
if (!bce->emitDupAt(slotFromTop)) {
// [stack] ITER ... EXCEPTION ITER
return false;

10
js/src/frontend/IfEmitter.cpp
View File

@ -41,10 +41,10 @@ bool BranchEmitterBase::emitThenInternal(SrcNoteType type) {
// To restore stack depth in else part, save depth of the then part.
#ifdef DEBUG
// If DEBUG, this is also necessary to calculate |pushed_|.
thenDepth_ = bce_->stackDepth;
thenDepth_ = bce_->bytecodeSection().stackDepth();
#else
if (type == SRC_COND || type == SRC_IF_ELSE) {
thenDepth_ = bce_->stackDepth;
thenDepth_ = bce_->bytecodeSection().stackDepth();
}
#endif
@ -59,10 +59,10 @@ bool BranchEmitterBase::emitThenInternal(SrcNoteType type) {
void BranchEmitterBase::calculateOrCheckPushed() {
#ifdef DEBUG
if (!calculatedPushed_) {
pushed_ = bce_->stackDepth - thenDepth_;
pushed_ = bce_->bytecodeSection().stackDepth() - thenDepth_;
calculatedPushed_ = true;
} else {
MOZ_ASSERT(pushed_ == bce_->stackDepth - thenDepth_);
MOZ_ASSERT(pushed_ == bce_->bytecodeSection().stackDepth() - thenDepth_);
}
#endif
}
@ -92,7 +92,7 @@ bool BranchEmitterBase::emitElseInternal() {
jumpAroundThen_ = JumpList();
// Restore stack depth of the then part.
bce_->stackDepth = thenDepth_;
bce_->bytecodeSection().setStackDepth(thenDepth_);
// Enclose else-branch with TDZCheckCache.
if (kind_ == Kind::MayContainLexicalAccessInBranch) {

12
js/src/frontend/TryEmitter.cpp
View File

@ -53,7 +53,7 @@ bool TryEmitter::emitTry() {
// For that we store in a try note associated with the catch or
// finally block the stack depth upon the try entry. The interpreter
// uses this depth to properly unwind the stack and the scope chain.
depth_ = bce_->stackDepth;
depth_ = bce_->bytecodeSection().stackDepth();
// Record the try location, then emit the try block.
if (!bce_->newSrcNote(SRC_TRY, &noteIndex_)) {
@ -72,7 +72,7 @@ bool TryEmitter::emitTry() {
bool TryEmitter::emitTryEnd() {
MOZ_ASSERT(state_ == State::Try);
MOZ_ASSERT(depth_ == bce_->stackDepth);
MOZ_ASSERT(depth_ == bce_->bytecodeSection().stackDepth());
// GOSUB to finally, if present.
if (hasFinally() && controlInfo_) {
@ -106,7 +106,7 @@ bool TryEmitter::emitCatch() {
return false;
}
MOZ_ASSERT(bce_->stackDepth == depth_);
MOZ_ASSERT(bce_->bytecodeSection().stackDepth() == depth_);
if (controlKind_ == ControlKind::Syntactic) {
// Clear the frame's return value that might have been set by the
@ -139,7 +139,7 @@ bool TryEmitter::emitCatchEnd() {
if (!bce_->emitGoSub(&controlInfo_->gosubs)) {
return false;
}
MOZ_ASSERT(bce_->stackDepth == depth_);
MOZ_ASSERT(bce_->bytecodeSection().stackDepth() == depth_);
// Jump over the finally block.
if (!bce_->emitJump(JSOP_GOTO, &catchAndFinallyJump_)) {
@ -178,7 +178,7 @@ bool TryEmitter::emitFinally(
}
}
MOZ_ASSERT(bce_->stackDepth == depth_);
MOZ_ASSERT(bce_->bytecodeSection().stackDepth() == depth_);
if (!bce_->emitJumpTarget(&finallyStart_)) {
return false;
@ -254,7 +254,7 @@ bool TryEmitter::emitEnd() {
}
}
MOZ_ASSERT(bce_->stackDepth == depth_);
MOZ_ASSERT(bce_->bytecodeSection().stackDepth() == depth_);
// ReconstructPCStack needs a NOP here to mark the end of the last
// catch block.

3
js/src/frontend/WhileEmitter.cpp
View File

@ -100,7 +100,8 @@ bool WhileEmitter::emitEnd() {
return false;
}
if (!bce_->addTryNote(JSTRY_LOOP, bce_->stackDepth, loopInfo_->headOffset(),
if (!bce_->addTryNote(JSTRY_LOOP, bce_->bytecodeSection().stackDepth(),
loopInfo_->headOffset(),
loopInfo_->breakTargetOffset())) {
return false;
}

3
js/src/vm/JSScript.cpp
View File

@ -3569,7 +3569,8 @@ bool JSScript::fullyInitFromEmitter(JSContext* cx, HandleScript script,
MOZ_ASSERT(bce->objectList.length <= INDEX_LIMIT);
uint64_t nslots =
bce->maxFixedSlots + static_cast<uint64_t>(bce->maxStackDepth);
bce->maxFixedSlots +
static_cast<uint64_t>(bce->bytecodeSection().maxStackDepth());
if (nslots > UINT32_MAX) {
bce->reportError(nullptr, JSMSG_NEED_DIET, js_script_str);
return false;