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

LibJS: Fix codegen for nodes after try statements without 'finally'

Browse source 
Previously we were just dropping them on the ground :P
This commit is contained in:
Ali Mohammad Pur 2021-11-10 22:22:26 +03:30 • committed by Linus Groh
parent 5a38f86f1b
commit b96118b5d1
4 changed files with 43 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1189,8 +1189,15 @@ void TryStatement::generate_bytecode(Bytecode::Generator& generator) const
generator.switch_to_basic_block(target_block);
m_block->generate_bytecode(generator);
if (m_finalizer && !generator.is_current_block_terminated())
generator.emit<Bytecode::Op::Jump>(finalizer_target);
if (!generator.is_current_block_terminated()) {
if (m_finalizer) {
generator.emit<Bytecode::Op::Jump>(finalizer_target);
} else {
auto& block = generator.make_block();
generator.emit<Bytecode::Op::FinishUnwind>(Bytecode::Label { block });
next_block = &block;
}
}
generator.switch_to_basic_block(next_block ? *next_block : saved_block);
}

1
Userland/Libraries/LibJS/Bytecode/Instruction.h
View file

@ -24,6 +24,7 @@
O(Div) \
O(EnterUnwindContext) \
O(Exp) \
O(FinishUnwind) \
O(GetById) \
O(GetByValue) \
O(GetIterator) \

17
Userland/Libraries/LibJS/Bytecode/Op.cpp
View file

@ -446,6 +446,18 @@ void EnterUnwindContext::replace_references_impl(BasicBlock const& from, BasicBl
m_finalizer_target = Label { to };
}
void FinishUnwind::execute_impl(Bytecode::Interpreter& interpreter) const
{
interpreter.leave_unwind_context();
interpreter.jump(m_next_target);
}
void FinishUnwind::replace_references_impl(BasicBlock const& from, BasicBlock const& to)
{
if (&m_next_target.block() == &from)
m_next_target = Label { to };
}
void LeaveUnwindContext::execute_impl(Bytecode::Interpreter& interpreter) const
{
interpreter.leave_unwind_context();
@ -751,6 +763,11 @@ String EnterUnwindContext::to_string_impl(Bytecode::Executable const&) const
return String::formatted("EnterUnwindContext handler:{} finalizer:{} entry:{}", handler_string, finalizer_string, m_entry_point);
}
String FinishUnwind::to_string_impl(const Bytecode::Executable&) const
{
return String::formatted("FinishUnwind next:{}", m_next_target);
}
String LeaveUnwindContext::to_string_impl(Bytecode::Executable const&) const
{
return "LeaveUnwindContext";

16
Userland/Libraries/LibJS/Bytecode/Op.h
View file

@ -610,6 +610,22 @@ public:
void replace_references_impl(BasicBlock const&, BasicBlock const&) { }
};
class FinishUnwind final : public Instruction {
public:
FinishUnwind(Label next)
: Instruction(Type::FinishUnwind)
, m_next_target(move(next))
{
}
void execute_impl(Bytecode::Interpreter&) const;
String to_string_impl(Bytecode::Executable const&) const;
void replace_references_impl(BasicBlock const&, BasicBlock const&);
private:
Label m_next_target;
};
class ContinuePendingUnwind final : public Instruction {
public:
constexpr static bool IsTerminator = true;