RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-21 15:35:07 +00:00
Code Issues Activity Actions

LibJS/Bytecode: Store unwind contexts inside RegisterWindow

Browse source 
Unwind contexts need to be preserved as we exit and re-enter a
generator.

For example, this would previously crash when returning from the try
statement after yielding as we lost the unwind context when yielding,
but still have a LeaveUnwindContext instruction from running
`perform_needed_unwinds` when generating the return statement.
```js
function* a() {
    try {
        return (yield 1);
    } catch {}
}

iter = a();
iter.next();
iter.next();
```
This commit is contained in:
Luke Wilde 2022-11-25 23:15:44 +00:00 • committed by Andreas Kling
parent b914680f0c
commit 277132f70d
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,7 @@ Interpreter::ValueAndFrame Interpreter::run_and_return_frame(Executable const& e
if (in_frame)
m_register_windows.append(in_frame);
else
m_register_windows.append(make<RegisterWindow>(MarkedVector<Value>(vm().heap()), MarkedVector<Environment*>(vm().heap()), MarkedVector<Environment*>(vm().heap())));
m_register_windows.append(make<RegisterWindow>(MarkedVector<Value>(vm().heap()), MarkedVector<Environment*>(vm().heap()), MarkedVector<Environment*>(vm().heap()), Vector<UnwindInfo> {}));
registers().resize(executable.number_of_registers);
@ -81,9 +81,9 @@ Interpreter::ValueAndFrame Interpreter::run_and_return_frame(Executable const& e
if (ran_or_error.is_error()) {
auto exception_value = *ran_or_error.throw_completion().value();
m_saved_exception = make_handle(exception_value);
if (m_unwind_contexts.is_empty())
if (unwind_contexts().is_empty())
break;
auto& unwind_context = m_unwind_contexts.last();
auto& unwind_context = unwind_contexts().last();
if (unwind_context.executable != m_current_executable)
break;
if (unwind_context.handler) {
@ -92,7 +92,7 @@ Interpreter::ValueAndFrame Interpreter::run_and_return_frame(Executable const& e
// If there's no finalizer, there's nowhere for the handler block to unwind to, so the unwind context is no longer needed.
if (!unwind_context.finalizer)
m_unwind_contexts.take_last();
unwind_contexts().take_last();
accumulator() = exception_value;
m_saved_exception = {};
@ -101,7 +101,7 @@ Interpreter::ValueAndFrame Interpreter::run_and_return_frame(Executable const& e
}
if (unwind_context.finalizer) {
m_current_block = unwind_context.finalizer;
m_unwind_contexts.take_last();
unwind_contexts().take_last();
will_jump = true;
break;
}
@ -179,12 +179,12 @@ Interpreter::ValueAndFrame Interpreter::run_and_return_frame(Executable const& e
void Interpreter::enter_unwind_context(Optional<Label> handler_target, Optional<Label> finalizer_target)
{
m_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);
}
void Interpreter::leave_unwind_context()
{
m_unwind_contexts.take_last();
unwind_contexts().take_last();
}
ThrowCompletionOr<void> Interpreter::continue_pending_unwind(Label const& resume_label)