RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 16:47:41 +00:00
Code Issues Activity Actions

LibJS/Bytecode: Fix multiple wrong jumps in ForStatement codegen

Browse source
This commit is contained in:
Andreas Kling 2023-06-15 19:13:00 +02:00
parent 0772a23c65
commit 6f39882f11
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -831,8 +831,16 @@ Bytecode::CodeGenerationErrorOr<void> ForStatement::generate_labelled_evaluation
Bytecode::Label { end_block }); Bytecode::Label { end_block });
} }
if (m_update) {
generator.switch_to_basic_block(*update_block_ptr);
TRY(m_update->generate_bytecode(generator));
generator.emit<Bytecode::Op::Jump>().set_targets(
Bytecode::Label { *test_block_ptr },
{});
}
generator.switch_to_basic_block(*body_block_ptr); generator.switch_to_basic_block(*body_block_ptr);
generator.begin_continuable_scope(Bytecode::Label { *update_block_ptr }, label_set); generator.begin_continuable_scope(Bytecode::Label { m_update ? *update_block_ptr : *test_block_ptr }, label_set);
generator.begin_breakable_scope(Bytecode::Label { end_block }, label_set); generator.begin_breakable_scope(Bytecode::Label { end_block }, label_set);
TRY(m_body->generate_bytecode(generator)); TRY(m_body->generate_bytecode(generator));
generator.end_breakable_scope(); generator.end_breakable_scope();
@ -843,14 +851,11 @@ Bytecode::CodeGenerationErrorOr<void> ForStatement::generate_labelled_evaluation
generator.emit<Bytecode::Op::Jump>().set_targets( generator.emit<Bytecode::Op::Jump>().set_targets(
Bytecode::Label { *update_block_ptr }, Bytecode::Label { *update_block_ptr },
{}); {});
} else {
generator.switch_to_basic_block(*update_block_ptr); generator.emit<Bytecode::Op::Jump>().set_targets(
TRY(m_update->generate_bytecode(generator)); Bytecode::Label { *test_block_ptr },
{});
} }
generator.emit<Bytecode::Op::Jump>().set_targets(
Bytecode::Label { *test_block_ptr },
{});
} }
generator.switch_to_basic_block(end_block); generator.switch_to_basic_block(end_block);