Explorar el Código

LibJS/JIT: Compile the DeleteById instruction

Jakub Berkop hace 1 año
padre
commit
f5fcd4596c

+ 11 - 0
Userland/Libraries/LibJS/Bytecode/CommonImplementations.cpp

@@ -624,4 +624,15 @@ ThrowCompletionOr<void> append(VM& vm, Value lhs, Value rhs, bool is_spread)
     return {};
 }
 
+ThrowCompletionOr<Value> delete_by_id(Bytecode::Interpreter& interpreter, Value base, IdentifierTableIndex property)
+{
+    auto& vm = interpreter.vm();
+
+    auto const& identifier = interpreter.current_executable().get_identifier(property);
+    bool strict = vm.in_strict_mode();
+    auto reference = Reference { base, identifier, {}, strict };
+
+    return TRY(reference.delete_(vm));
+}
+
 }

+ 1 - 0
Userland/Libraries/LibJS/Bytecode/CommonImplementations.h

@@ -39,5 +39,6 @@ Object* iterator_to_object(VM&, IteratorRecord);
 IteratorRecord object_to_iterator(VM&, Object&);
 ThrowCompletionOr<NonnullGCPtr<Array>> iterator_to_array(VM&, Value iterator);
 ThrowCompletionOr<void> append(VM& vm, Value lhs, Value rhs, bool is_spread);
+ThrowCompletionOr<Value> delete_by_id(Bytecode::Interpreter&, Value base, IdentifierTableIndex identifier);
 
 }

+ 1 - 5
Userland/Libraries/LibJS/Bytecode/Interpreter.cpp

@@ -817,12 +817,8 @@ ThrowCompletionOr<void> PutPrivateById::execute_impl(Bytecode::Interpreter& inte
 
 ThrowCompletionOr<void> DeleteById::execute_impl(Bytecode::Interpreter& interpreter) const
 {
-    auto& vm = interpreter.vm();
     auto base_value = interpreter.accumulator();
-    auto const& identifier = interpreter.current_executable().get_identifier(m_property);
-    bool strict = vm.in_strict_mode();
-    auto reference = Reference { base_value, identifier, {}, strict };
-    interpreter.accumulator() = Value(TRY(reference.delete_(vm)));
+    interpreter.accumulator() = TRY(Bytecode::delete_by_id(interpreter, base_value, m_property));
     return {};
 }
 

+ 2 - 0
Userland/Libraries/LibJS/Bytecode/Op.h

@@ -723,6 +723,8 @@ public:
     ThrowCompletionOr<void> execute_impl(Bytecode::Interpreter&) const;
     DeprecatedString to_deprecated_string_impl(Bytecode::Executable const&) const;
 
+    IdentifierTableIndex property() const { return m_property; }
+
 private:
     IdentifierTableIndex m_property;
 };

+ 16 - 0
Userland/Libraries/LibJS/JIT/Compiler.cpp

@@ -1336,6 +1336,22 @@ void Compiler::compile_append(Bytecode::Op::Append const& op)
     check_exception();
 }
 
+static Value cxx_delete_by_id(VM& vm, Value base, Bytecode::IdentifierTableIndex property)
+{
+    return TRY_OR_SET_EXCEPTION(Bytecode::delete_by_id(vm.bytecode_interpreter(), base, property));
+}
+
+void Compiler::compile_delete_by_id(Bytecode::Op::DeleteById const& op)
+{
+    load_vm_register(ARG1, Bytecode::Register::accumulator());
+    m_assembler.mov(
+        Assembler::Operand::Register(ARG2),
+        Assembler::Operand::Imm(op.property().value()));
+    native_call((void*)cxx_delete_by_id);
+    store_vm_register(Bytecode::Register::accumulator(), RET);
+    check_exception();
+}
+
 void Compiler::jump_to_exit()
 {
     m_assembler.jump(m_exit_label);

+ 2 - 1
Userland/Libraries/LibJS/JIT/Compiler.h

@@ -114,7 +114,8 @@ private:
         O(IteratorResultValue, iterator_result_value)                            \
         O(IteratorClose, iterator_close)                                         \
         O(IteratorToArray, iterator_to_array)                                    \
-        O(Append, append)
+        O(Append, append)                                                        \
+        O(DeleteById, delete_by_id)
 
 #    define DECLARE_COMPILE_OP(OpTitleCase, op_snake_case) \
         void compile_##op_snake_case(Bytecode::Op::OpTitleCase const&);