RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 22:02:44 +00:00
Code Issues Activity Actions

LibJS/Bytecode: Setup declarative environment for lexical for statements

Browse source
This commit is contained in:
Luke Wilde 2022-03-14 02:39:24 +00:00 • committed by Ali Mohammad Pur
parent 97af7654dd
commit 750b69540e
1 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Libraries/LibJS/Bytecode/ASTCodegen.cpp
View file

@ -723,8 +723,29 @@ Bytecode::CodeGenerationErrorOr<void> ForStatement::generate_bytecode(Bytecode::
auto& end_block = generator.make_block(); auto& end_block = generator.make_block();
if (m_init) bool has_lexical_environment = false;
if (m_init) {
if (m_init->is_variable_declaration()) {
auto& variable_declaration = verify_cast<VariableDeclaration>(*m_init);
if (variable_declaration.is_lexical_declaration()) {
has_lexical_environment = true;
// FIXME: Is Block correct?
generator.begin_variable_scope(Bytecode::Generator::BindingMode::Lexical, Bytecode::Generator::SurroundingScopeKind::Block);
bool is_const = variable_declaration.is_constant_declaration();
variable_declaration.for_each_bound_name([&](auto const& name) {
auto index = generator.intern_identifier(name);
generator.register_binding(index);
generator.emit<Bytecode::Op::CreateVariable>(index, Bytecode::Op::EnvironmentMode::Lexical, is_const);
});
}
}
TRY(m_init->generate_bytecode(generator)); TRY(m_init->generate_bytecode(generator));
}
body_block_ptr = &generator.make_block(); body_block_ptr = &generator.make_block();
@ -761,6 +782,9 @@ Bytecode::CodeGenerationErrorOr<void> ForStatement::generate_bytecode(Bytecode::
generator.end_breakable_scope(); generator.end_breakable_scope();
generator.end_continuable_scope(); generator.end_continuable_scope();
if (has_lexical_environment)
generator.end_variable_scope();
if (!generator.is_current_block_terminated()) { if (!generator.is_current_block_terminated()) {
if (m_update) { if (m_update) {
generator.emit<Bytecode::Op::Jump>().set_targets( generator.emit<Bytecode::Op::Jump>().set_targets(