RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-23 18:25:08 +00:00
Code Issues Activity Actions

LibJS/Bytecode: Restore old environments when an exception is caught

Browse source 
Unwind contexts now remember the lexical and variable environments in
effect when they were created. If an exception is caught, we revert
to those environments in the running execution context.
This commit is contained in:
Andreas Kling 2023-05-13 18:53:14 +02:00
parent 81a62f4f59
commit ce634957c1
2 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibJS/Bytecode/Interpreter.cpp
View file

@ -91,6 +91,8 @@ Interpreter::ValueAndFrame Interpreter::run_and_return_frame(Executable const& e
if (unwind_context.executable != m_current_executable)
break;
if (unwind_context.handler) {
vm().running_execution_context().lexical_environment = unwind_context.lexical_environment;
vm().running_execution_context().variable_environment = unwind_context.variable_environment;
m_current_block = unwind_context.handler;
unwind_context.handler = nullptr;
@ -205,7 +207,12 @@ Interpreter::ValueAndFrame Interpreter::run_and_return_frame(Executable const& e
void Interpreter::enter_unwind_context(Optional<Label> handler_target, Optional<Label> finalizer_target)
{
unwind_contexts().empend(m_current_executable, handler_target.has_value() ? &handler_target->block() : nullptr, finalizer_target.has_value() ? &finalizer_target->block() : nullptr);
unwind_contexts().empend(
m_current_executable,
handler_target.has_value() ? &handler_target->block() : nullptr,
finalizer_target.has_value() ? &finalizer_target->block() : nullptr,
vm().running_execution_context().lexical_environment,
vm().running_execution_context().variable_environment);
}
void Interpreter::leave_unwind_context()