wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-04 06:48:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #2142 - Handle fields in derived classes

Browse source 
* Don't name field initializer lambdas

Based-on: m-c 1534721, 1551454, 1542448
This commit is contained in:
Martok 2023-04-08 03:47:06 +02:00 • committed by roytam1
commit 235ca77949
13 changed files with 361 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

71
js/src/frontend/FunctionEmitter.cpp
View file

@ -477,9 +477,16 @@ bool FunctionScriptEmitter::prepareForBody()
}
if (funbox_->function()->kind() == JSFunction::FunctionKind::ClassConstructor) {
if (!emitInitializeInstanceFields()) {
// [stack]
return false;
if (funbox_->isDerivedClassConstructor()) {
if (!bce_->emitCopyInitializersToLocalInitializers()) {
// [stack]
return false;
}
} else {
if (!bce_->emitInitializeInstanceFields(false)) {
// [stack]
return false;
}
}
}
@ -551,64 +558,6 @@ bool FunctionScriptEmitter::emitExtraBodyVarScope()
return true;
}
bool FunctionScriptEmitter::emitInitializeInstanceFields()
{
MOZ_ASSERT(bce_->fieldInitializers_.valid);
size_t numFields = bce_->fieldInitializers_.numFieldInitializers;
if (numFields == 0) {
return true;
}
if (!bce_->emitGetName(bce_->cx->names().dotInitializers)) {
// [stack] ARRAY
return false;
}
for (size_t fieldIndex = 0; fieldIndex < numFields; fieldIndex++) {
if (fieldIndex < numFields - 1) {
// We DUP to keep the array around (it is consumed in the bytecode below)
// for next iterations of this loop, except for the last iteration, which
// avoids an extra POP at the end of the loop.
if (!bce_->emit1(JSOP_DUP)) {
// [stack] ARRAY ARRAY
return false;
}
}
if (!bce_->emitNumberOp(fieldIndex)) {
// [stack] ARRAY? ARRAY INDEX
return false;
}
// Don't use CALLELEM here, because the receiver of the call != the receiver
// of this getelem. (Specifically, the call receiver is `this`, and the
// receiver of this getelem is `.initializers`)
if (!bce_->emit1(JSOP_GETELEM)) {
// [stack] ARRAY? FUNC
return false;
}
// This is guaranteed to run after super(), so we don't need TDZ checks.
if (!bce_->emitGetName(bce_->cx->names().dotThis)) {
// [stack] ARRAY? FUNC THIS
return false;
}
if (!bce_->emitCall(JSOP_CALL_IGNORES_RV, 0)) {
// [stack] ARRAY? RVAL
return false;
}
if (!bce_->emit1(JSOP_POP)) {
// [stack] ARRAY?
return false;
}
}
return true;
}
bool FunctionScriptEmitter::emitEndBody()
{
MOZ_ASSERT(state_ == State::Body);