Unify DeleteMember and DeleteSubscript instructions

The delete operator is rarely used, so it's simpler to
unify these into one DeleteProperty instruction.

Change-Id: I8c0d4455b35efb03db2ab0010df70030d774a6ae
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 5 insertions, 31 deletions

diff --git a/src/qml/jit/qv4baselinejit.cpp b/src/qml/jit/qv4baselinejit.cpp
index b994d38c2b..ac6fc976f4 100644
--- a/src/qml/jit/qv4baselinejit.cpp
+++ b/src/qml/jit/qv4baselinejit.cpp
@@ -710,35 +710,10 @@ void BaselineJIT::generate_DestructureRestElement()
     as->checkException();
 }
 
-
-
-static ReturnedValue deleteMemberHelper(QV4::Function *function, const QV4::Value &base, int member)
-{
-    auto engine = function->internalClass->engine;
-    if (!Runtime::method_deleteMember(engine, base, member)) {
-        if (function->isStrict())
-            engine->throwTypeError();
-        return Encode(false);
-    } else {
-        return Encode(true);
-    }
-}
-
-void BaselineJIT::generate_DeleteMember(int member, int base)
-{
-    STORE_IP();
-    as->prepareCallWithArgCount(3);
-    as->passInt32AsArg(member, 2);
-    as->passRegAsArg(base, 1);
-    as->passFunctionAsArg(0);
-    JIT_GENERATE_RUNTIME_CALL(deleteMemberHelper, Assembler::ResultInAccumulator);
-    as->checkException();
-}
-
-static ReturnedValue deleteSubscriptHelper(QV4::Function *function, const QV4::Value &base, const QV4::Value &index)
+static ReturnedValue deletePropertyHelper(QV4::Function *function, const QV4::Value &base, const QV4::Value &index)
 {
     auto engine = function->internalClass->engine;
-    if (!Runtime::method_deleteElement(engine, base, index)) {
+    if (!Runtime::method_deleteProperty(engine, base, index)) {
         if (function->isStrict())
             engine->throwTypeError();
         return Encode(false);
@@ -747,14 +722,14 @@ static ReturnedValue deleteSubscriptHelper(QV4::Function *function, const QV4::V
     }
 }
 
-void BaselineJIT::generate_DeleteSubscript(int base, int index)
+void BaselineJIT::generate_DeleteProperty(int base, int index)
 {
     STORE_IP();
     as->prepareCallWithArgCount(3);
     as->passRegAsArg(index, 2);
     as->passRegAsArg(base, 1);
     as->passFunctionAsArg(0);
-    JIT_GENERATE_RUNTIME_CALL(deleteSubscriptHelper, Assembler::ResultInAccumulator);
+    JIT_GENERATE_RUNTIME_CALL(deletePropertyHelper, Assembler::ResultInAccumulator);
     as->checkException();
 }
 
diff --git a/src/qml/jit/qv4baselinejit_p.h b/src/qml/jit/qv4baselinejit_p.h
index 112cb92c75..fda410db69 100644
--- a/src/qml/jit/qv4baselinejit_p.h
+++ b/src/qml/jit/qv4baselinejit_p.h
@@ -146,8 +146,7 @@ public:
     void generate_IteratorNext(int value) override;
     void generate_IteratorClose(int done) override;
     void generate_DestructureRestElement() override;
-    void generate_DeleteMember(int member, int base) override;
-    void generate_DeleteSubscript(int base, int index) override;
+    void generate_DeleteProperty(int base, int index) override;
     void generate_DeleteName(int name) override;
     void generate_TypeofName(int name) override;
     void generate_TypeofValue() override;