mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 17:17:42 +00:00
LibJS: Handle unwinding in while and do-while statements
For some reason, this was never added. So something like "while (true) { return }" would loop infinitely.
This commit is contained in:
parent
397e5766ff
commit
d980073122
2 changed files with 20 additions and 0 deletions
|
@ -262,6 +262,16 @@ Value WhileStatement::execute(Interpreter& interpreter, GlobalObject& global_obj
|
||||||
last_value = interpreter.execute_statement(global_object, *m_body);
|
last_value = interpreter.execute_statement(global_object, *m_body);
|
||||||
if (interpreter.exception())
|
if (interpreter.exception())
|
||||||
return {};
|
return {};
|
||||||
|
if (interpreter.vm().should_unwind()) {
|
||||||
|
if (interpreter.vm().should_unwind_until(ScopeType::Continuable, m_label)) {
|
||||||
|
interpreter.vm().stop_unwind();
|
||||||
|
} else if (interpreter.vm().should_unwind_until(ScopeType::Breakable, m_label)) {
|
||||||
|
interpreter.vm().stop_unwind();
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
return js_undefined();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return last_value;
|
return last_value;
|
||||||
|
@ -276,6 +286,16 @@ Value DoWhileStatement::execute(Interpreter& interpreter, GlobalObject& global_o
|
||||||
last_value = interpreter.execute_statement(global_object, *m_body);
|
last_value = interpreter.execute_statement(global_object, *m_body);
|
||||||
if (interpreter.exception())
|
if (interpreter.exception())
|
||||||
return {};
|
return {};
|
||||||
|
if (interpreter.vm().should_unwind()) {
|
||||||
|
if (interpreter.vm().should_unwind_until(ScopeType::Continuable, m_label)) {
|
||||||
|
interpreter.vm().stop_unwind();
|
||||||
|
} else if (interpreter.vm().should_unwind_until(ScopeType::Breakable, m_label)) {
|
||||||
|
interpreter.vm().stop_unwind();
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
return js_undefined();
|
||||||
|
}
|
||||||
|
}
|
||||||
} while (m_test->execute(interpreter, global_object).to_boolean());
|
} while (m_test->execute(interpreter, global_object).to_boolean());
|
||||||
|
|
||||||
return last_value;
|
return last_value;
|
||||||
|
|
0
Libraries/LibJS/Tests/return.js
Normal file
0
Libraries/LibJS/Tests/return.js
Normal file
Loading…
Add table
Add a link
Reference in a new issue