beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-29 08:11:13 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibJS: Remove an old VERIFY from break handling in try-finally blocks

Browse source 
The VERIFY assumed that we either have a finally block which we already
visited through a previous boundary or have no finally block what so
ever; But since 301a1fc763 we propagate
finalizers through unwind scopes breaking that assumption.
This commit is contained in:
Hendiadyoin1 2024-05-19 16:45:38 +02:00 committed by Andreas Kling
parent 3438293e7b
commit d79347dd4a
Notes: sideshowbarker 2024-07-17 05:19:06 +09:00 
Author: https://github.com/Hendiadyoin1
Commit: https://github.com/SerenityOS/serenity/commit/d79347dd4a
Pull-request: https://github.com/SerenityOS/serenity/pull/24383
2 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibJS/Bytecode/Generator.cpp
View file

@ -902,7 +902,6 @@ void Generator::generate_scoped_jump(JumpType type)
}
break;
case Unwind:
VERIFY(last_was_finally || !m_current_unwind_context->finalizer().has_value());
if (!last_was_finally) {
VERIFY(m_current_unwind_context && m_current_unwind_context->handler().has_value());
emit<Bytecode::Op::LeaveUnwindContext>();
@ -944,7 +943,6 @@ void Generator::generate_labelled_jump(JumpType type, DeprecatedFlyString const&
for (; current_boundary > 0; --current_boundary) {
auto boundary = m_boundaries[current_boundary - 1];
if (boundary == BlockBoundaryType::Unwind) {
VERIFY(last_was_finally || !m_current_unwind_context->finalizer().has_value());
if (!last_was_finally) {
VERIFY(m_current_unwind_context && m_current_unwind_context->handler().has_value());
emit<Bytecode::Op::LeaveUnwindContext>();

40
Userland/Libraries/LibJS/Tests/try-finally-break.js
View file

@ -450,3 +450,43 @@ test("Throw while breaking with nested try-catch-finally with throw in finalizer
expect(executionOrder).toEqual([1, 2, 3, 4, 5]);
});
test("Labelled break with nested mixed try-catch/finally", () => {
const executionOrder = [];
scope: {
try {
try {
executionOrder.push(1);
break scope;
} catch {
expect.fail("Entered catch");
}
expect.fail("Continued after inner try");
} finally {
executionOrder.push(2);
}
expect.fail("Continued after outer try");
}
expect(executionOrder).toEqual([1, 2]);
});
test("Break with nested mixed try-catch/finally", () => {
const executionOrder = [];
do {
try {
try {
executionOrder.push(1);
break;
} catch {
expect.fail("Entered catch");
}
expect.fail("Continued after inner try");
} finally {
executionOrder.push(2);
}
expect.fail("Continued after outer try");
} while (expect.fail("Continued after do-while loop"));
expect(executionOrder).toEqual([1, 2]);
});