Always pass the ExecutionEngine into lookup calls

This is required in preparation for proper write barriers,
where we'll need to check the engine whether the barrier is
enabled.

It also makes the lookup calls more consistent, and doesn't
affect performance in any measurable way.

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

1 files changed, 9 insertions, 3 deletions

diff --git a/src/qml/jit/qv4isel_masm_p.h b/src/qml/jit/qv4isel_masm_p.h
index 5c046cb397..5764c3946e 100644
--- a/src/qml/jit/qv4isel_masm_p.h
+++ b/src/qml/jit/qv4isel_masm_p.h
@@ -260,8 +260,8 @@ private:
 
     void calculateRegistersToSave(const RegisterInformation &used);
 
-    template <typename Retval, typename Arg1, typename Arg2, typename Arg3>
-    void generateLookupCall(Retval retval, uint index, uint getterSetterOffset, Arg1 arg1, Arg2 arg2, Arg3 arg3)
+    template <typename Retval, typename Arg1, typename Arg2, typename Arg3, typename Arg4>
+    void generateLookupCall(Retval retval, uint index, uint getterSetterOffset, Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4)
     {
         // Note: using the return value register is intentional: for ABIs where the first parameter
         // goes into the same register as the return value (currently only ARM), the prepareCall
@@ -271,7 +271,7 @@ private:
 
          _as->generateFunctionCallImp(true, retval, "lookup getter/setter",
                                       typename JITAssembler::LookupCall(lookupAddr, getterSetterOffset), lookupAddr,
-                                      arg1, arg2, arg3);
+                                      arg1, arg2, arg3, arg4);
     }
 
     template <typename Retval, typename Arg1, typename Arg2>
@@ -280,6 +280,12 @@ private:
         generateLookupCall(retval, index, getterSetterOffset, arg1, arg2, typename JITAssembler::VoidType());
     }
 
+    template <typename Retval, typename Arg1, typename Arg2, typename Arg3>
+    void generateLookupCall(Retval retval, uint index, uint getterSetterOffset, Arg1 arg1, Arg2 arg2, Arg3 arg3)
+    {
+        generateLookupCall(retval, index, getterSetterOffset, arg1, arg2, arg3, typename JITAssembler::VoidType());
+    }
+
     IR::BasicBlock *_block;
     BitVector _removableJumps;
     JITAssembler* _as;