RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

LibJS: Execute the finalizer when returning from a try block in the JIT

Browse source 
This fixes 1 of the 2 remaining failing test-js tests.
This commit is contained in:
Idan Horowitz 2023-10-28 17:37:59 +03:00 • committed by Andreas Kling
parent 78cac671b6
commit 0768bf2623
2 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Userland/Libraries/LibJS/JIT/Compiler.cpp
View file

@ -566,6 +566,32 @@ JS_ENUMERATE_COMMON_UNARY_OPS(DO_COMPILE_COMMON_UNARY_OP)
void Compiler::compile_return(Bytecode::Op::Return const&) void Compiler::compile_return(Bytecode::Op::Return const&)
{ {
load_vm_register(GPR0, Bytecode::Register::accumulator()); load_vm_register(GPR0, Bytecode::Register::accumulator());
// check for finalizer
// if (!unwind_context.valid) goto normal_return;
auto normal_return = m_assembler.make_label();
m_assembler.mov(
Assembler::Operand::Register(GPR1),
Assembler::Operand::Mem64BaseAndOffset(UNWIND_CONTEXT_BASE, 0));
m_assembler.jump_if_equal(
Assembler::Operand::Register(GPR1),
Assembler::Operand::Imm(0),
normal_return);
// if (!unwind_context.finalizer) goto normal_return;
m_assembler.mov(
Assembler::Operand::Register(GPR1),
Assembler::Operand::Mem64BaseAndOffset(UNWIND_CONTEXT_BASE, 16));
m_assembler.jump_if_equal(
Assembler::Operand::Register(GPR1),
Assembler::Operand::Imm(0),
normal_return);
store_vm_register(Bytecode::Register::saved_return_value(), GPR0);
m_assembler.jump(Assembler::Operand::Register(GPR1));
// normal_return:
normal_return.link(m_assembler);
store_vm_register(Bytecode::Register::return_value(), GPR0); store_vm_register(Bytecode::Register::return_value(), GPR0);
m_assembler.exit(); m_assembler.exit();
} }
@ -933,6 +959,21 @@ void Compiler::compile_set_variable(Bytecode::Op::SetVariable const& op)
check_exception(); check_exception();
} }
void Compiler::compile_continue_pending_unwind(Bytecode::Op::ContinuePendingUnwind const& op)
{
// re-throw the exception if we reached the end of the finally block and there was no catch block to handle it
check_exception();
// if (!saved_return_value.is_empty()) goto resume_block;
load_vm_register(GPR0, Bytecode::Register::saved_return_value());
m_assembler.mov(Assembler::Operand::Register(GPR1), Assembler::Operand::Imm(Value().encoded()));
m_assembler.jump_if_not_equal(Assembler::Operand::Register(GPR0), Assembler::Operand::Register(GPR1), label_for(op.resume_target().block()));
// finish the pending return from the try block
store_vm_register(Bytecode::Register::return_value(), GPR0);
m_assembler.exit();
}
static void cxx_create_lexical_environment(VM& vm) static void cxx_create_lexical_environment(VM& vm)
{ {
auto make_and_swap_envs = [&](auto& old_environment) { auto make_and_swap_envs = [&](auto& old_environment) {
@ -1088,6 +1129,9 @@ OwnPtr<NativeExecutable> Compiler::compile(Bytecode::Executable& bytecode_execut
case Bytecode::Instruction::Type::LessThan: case Bytecode::Instruction::Type::LessThan:
compiler.compile_less_than(static_cast<Bytecode::Op::LessThan const&>(op)); compiler.compile_less_than(static_cast<Bytecode::Op::LessThan const&>(op));
break; break;
case Bytecode::Instruction::Type::ContinuePendingUnwind:
compiler.compile_continue_pending_unwind(static_cast<Bytecode::Op::ContinuePendingUnwind const&>(op));
break;
# define DO_COMPILE_COMMON_BINARY_OP(TitleCaseName, snake_case_name) \ # define DO_COMPILE_COMMON_BINARY_OP(TitleCaseName, snake_case_name) \
case Bytecode::Instruction::Type::TitleCaseName: \ case Bytecode::Instruction::Type::TitleCaseName: \

1
Userland/Libraries/LibJS/JIT/Compiler.h
View file

@ -112,6 +112,7 @@ private:
void compile_call(Bytecode::Op::Call const&); void compile_call(Bytecode::Op::Call const&);
void compile_typeof_variable(Bytecode::Op::TypeofVariable const&); void compile_typeof_variable(Bytecode::Op::TypeofVariable const&);
void compile_set_variable(Bytecode::Op::SetVariable const&); void compile_set_variable(Bytecode::Op::SetVariable const&);
void compile_continue_pending_unwind(Bytecode::Op::ContinuePendingUnwind const&);
void store_vm_register(Bytecode::Register, Assembler::Reg); void store_vm_register(Bytecode::Register, Assembler::Reg);
void load_vm_register(Assembler::Reg, Bytecode::Register); void load_vm_register(Assembler::Reg, Bytecode::Register);