mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 18:27:42 +00:00
LibJS: Fix codegen for nodes after try statements without 'finally'
Previously we were just dropping them on the ground :P
This commit is contained in:
parent
5a38f86f1b
commit
b96118b5d1
4 changed files with 43 additions and 2 deletions
|
@ -1189,8 +1189,15 @@ void TryStatement::generate_bytecode(Bytecode::Generator& generator) const
|
||||||
|
|
||||||
generator.switch_to_basic_block(target_block);
|
generator.switch_to_basic_block(target_block);
|
||||||
m_block->generate_bytecode(generator);
|
m_block->generate_bytecode(generator);
|
||||||
if (m_finalizer && !generator.is_current_block_terminated())
|
if (!generator.is_current_block_terminated()) {
|
||||||
generator.emit<Bytecode::Op::Jump>(finalizer_target);
|
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 = █
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
generator.switch_to_basic_block(next_block ? *next_block : saved_block);
|
generator.switch_to_basic_block(next_block ? *next_block : saved_block);
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
O(Div) \
|
O(Div) \
|
||||||
O(EnterUnwindContext) \
|
O(EnterUnwindContext) \
|
||||||
O(Exp) \
|
O(Exp) \
|
||||||
|
O(FinishUnwind) \
|
||||||
O(GetById) \
|
O(GetById) \
|
||||||
O(GetByValue) \
|
O(GetByValue) \
|
||||||
O(GetIterator) \
|
O(GetIterator) \
|
||||||
|
|
|
@ -446,6 +446,18 @@ void EnterUnwindContext::replace_references_impl(BasicBlock const& from, BasicBl
|
||||||
m_finalizer_target = Label { to };
|
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
|
void LeaveUnwindContext::execute_impl(Bytecode::Interpreter& interpreter) const
|
||||||
{
|
{
|
||||||
interpreter.leave_unwind_context();
|
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);
|
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
|
String LeaveUnwindContext::to_string_impl(Bytecode::Executable const&) const
|
||||||
{
|
{
|
||||||
return "LeaveUnwindContext";
|
return "LeaveUnwindContext";
|
||||||
|
|
|
@ -610,6 +610,22 @@ public:
|
||||||
void replace_references_impl(BasicBlock const&, BasicBlock const&) { }
|
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 {
|
class ContinuePendingUnwind final : public Instruction {
|
||||||
public:
|
public:
|
||||||
constexpr static bool IsTerminator = true;
|
constexpr static bool IsTerminator = true;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue