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

LibJS: Propagate abrupt completions in Bytecode::Op::Call

Browse source 
This was not handling the nullary call case correctly, remove the whole
nullary check as there's nothing particularly expensive in the catch-all
case anyway.
This commit is contained in:
Ali Mohammad Pur 2022-03-13 11:48:50 +03:30 • committed by Andreas Kling
parent fd8a56cdde
commit 41184c960d
1 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Userland/Libraries/LibJS/Bytecode/Op.cpp
View file

@ -400,22 +400,15 @@ ThrowCompletionOr<void> Call::execute_impl(Bytecode::Interpreter& interpreter) c
auto this_value = interpreter.reg(m_this_value);
MarkedVector<Value> argument_values { interpreter.vm().heap() };
for (size_t i = 0; i < m_argument_count; ++i)
argument_values.append(interpreter.reg(m_arguments[i]));
Value return_value;
if (m_argument_count == 0 && m_type == CallType::Call) {
auto return_value_or_error = call(interpreter.global_object(), function, this_value);
if (!return_value_or_error.is_error())
return_value = return_value_or_error.release_value();
} else {
MarkedVector<Value> argument_values { interpreter.vm().heap() };
for (size_t i = 0; i < m_argument_count; ++i)
argument_values.append(interpreter.reg(m_arguments[i]));
if (m_type == CallType::Call)
return_value = TRY(call(interpreter.global_object(), function, this_value, move(argument_values)));
else
return_value = TRY(construct(interpreter.global_object(), function, move(argument_values)));
}
if (m_type == CallType::Call)
return_value = TRY(call(interpreter.global_object(), function, this_value, move(argument_values)));
else
return_value = TRY(construct(interpreter.global_object(), function, move(argument_values)));
interpreter.accumulator() = return_value;
return {};