RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:38:11 +00:00
Code Issues Activity Actions

LibJS: Leave the unwind context on break/continue/return in bytecode

Browse source 
Otherwise we'd keep the old unwind context, and end up never invoking
the other handlers up the stack.
This commit is contained in:
Ali Mohammad Pur 2022-03-13 11:51:02 +03:30 • committed by Andreas Kling
parent 41184c960d
commit ba9c4959d6
3 changed files with 44 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Userland/Libraries/LibJS/Bytecode/Generator.h
View file

@ -171,6 +171,36 @@ public:
}
}
enum class BlockBoundaryType {
Break,
Continue,
Unwind,
};
template<typename OpType>
void perform_needed_unwinds(bool is_break_node = false) requires(OpType::IsTerminator)
{
Optional<BlockBoundaryType> boundary_to_stop_at;
if constexpr (IsSame<OpType, Bytecode::Op::Return> || IsSame<OpType, Bytecode::Op::Yield>)
VERIFY(!is_break_node);
else
boundary_to_stop_at = is_break_node ? BlockBoundaryType::Break : BlockBoundaryType::Continue;
for (size_t i = m_boundaries.size(); i > 0; --i) {
auto boundary = m_boundaries[i - 1];
if (boundary_to_stop_at.has_value() && boundary == *boundary_to_stop_at)
break;
if (boundary == BlockBoundaryType::Unwind)
emit<Bytecode::Op::LeaveUnwindContext>();
}
}
void start_boundary(BlockBoundaryType type) { m_boundaries.append(type); }
void end_boundary(BlockBoundaryType type)
{
VERIFY(m_boundaries.last() == type);
m_boundaries.take_last();
}
private:
Generator();
~Generator();
@ -189,6 +219,7 @@ private:
Vector<Label> m_continuable_scopes;
Vector<Label> m_breakable_scopes;
Vector<LexicalScope> m_variable_scopes;
Vector<BlockBoundaryType> m_boundaries;
};
}