diff --git a/Userland/Libraries/LibJS/Bytecode/Op.h b/Userland/Libraries/LibJS/Bytecode/Op.h index 7cf2c39078..26cb84c1e4 100644 --- a/Userland/Libraries/LibJS/Bytecode/Op.h +++ b/Userland/Libraries/LibJS/Bytecode/Op.h @@ -1343,6 +1343,9 @@ public: ThrowCompletionOr execute_impl(Bytecode::Interpreter&) const; DeprecatedString to_deprecated_string_impl(Bytecode::Executable const&) const; + Completion::Type completion_type() const { return m_completion_type; } + Optional const& completion_value() const { return m_completion_value; } + private: Completion::Type m_completion_type { Completion::Type::Normal }; Optional m_completion_value; diff --git a/Userland/Libraries/LibJS/JIT/Compiler.cpp b/Userland/Libraries/LibJS/JIT/Compiler.cpp index ce0b637490..3869b1e656 100644 --- a/Userland/Libraries/LibJS/JIT/Compiler.cpp +++ b/Userland/Libraries/LibJS/JIT/Compiler.cpp @@ -1283,6 +1283,29 @@ void Compiler::compile_iterator_result_value(Bytecode::Op::IteratorResultValue c check_exception(); } +static Value cxx_iterator_close(VM& vm, Value iterator, Completion::Type completion_type, Optional const& completion_value) +{ + auto iterator_object = TRY_OR_SET_EXCEPTION(iterator.to_object(vm)); + auto iterator_record = Bytecode::object_to_iterator(vm, iterator_object); + + // FIXME: Return the value of the resulting completion. (Note that m_completion_value can be empty!) + TRY_OR_SET_EXCEPTION(iterator_close(vm, iterator_record, Completion { completion_type, completion_value, {} })); + return {}; +} + +void Compiler::compile_iterator_close(Bytecode::Op::IteratorClose const& op) +{ + load_vm_register(ARG1, Bytecode::Register::accumulator()); + m_assembler.mov( + Assembler::Operand::Register(ARG2), + Assembler::Operand::Imm(to_underlying(op.completion_type()))); + m_assembler.mov( + Assembler::Operand::Register(ARG3), + Assembler::Operand::Imm(bit_cast(&op.completion_value()))); + native_call((void*)cxx_iterator_close); + check_exception(); +} + void Compiler::jump_to_exit() { m_assembler.jump(m_exit_label); diff --git a/Userland/Libraries/LibJS/JIT/Compiler.h b/Userland/Libraries/LibJS/JIT/Compiler.h index daca096d1a..5d87c37cc4 100644 --- a/Userland/Libraries/LibJS/JIT/Compiler.h +++ b/Userland/Libraries/LibJS/JIT/Compiler.h @@ -111,7 +111,8 @@ private: O(IteratorResultDone, iterator_result_done) \ O(ThrowIfNotObject, throw_if_not_object) \ O(ThrowIfNullish, throw_if_nullish) \ - O(IteratorResultValue, iterator_result_value) + O(IteratorResultValue, iterator_result_value) \ + O(IteratorClose, iterator_close) # define DECLARE_COMPILE_OP(OpTitleCase, op_snake_case) \ void compile_##op_snake_case(Bytecode::Op::OpTitleCase const&);