Access context properties through the qml context

And get rid of another temp in the IR.

Change-Id: I039393e020e5141f1986aee276246c30fd8057f3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 26 insertions, 6 deletions

diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index 7716c1c060..886ff99ce7 100644
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -65,7 +65,9 @@ QT_BEGIN_NAMESPACE
     F(StoreQObjectProperty, storeQObjectProperty) \
     F(LoadQObjectProperty, loadQObjectProperty) \
     F(StoreScopeObjectProperty, storeScopeObjectProperty) \
+    F(StoreContextObjectProperty, storeContextObjectProperty) \
     F(LoadScopeObjectProperty, loadScopeObjectProperty) \
+    F(LoadContextObjectProperty, loadContextObjectProperty) \
     F(LoadAttachedQObjectProperty, loadAttachedQObjectProperty) \
     F(LoadSingletonQObjectProperty, loadQObjectProperty) \
     F(Push, push) \
@@ -73,6 +75,7 @@ QT_BEGIN_NAMESPACE
     F(CallProperty, callProperty) \
     F(CallPropertyLookup, callPropertyLookup) \
     F(CallScopeObjectProperty, callScopeObjectProperty) \
+    F(CallContextObjectProperty, callContextObjectProperty) \
     F(CallElement, callElement) \
     F(CallActivationProperty, callActivationProperty) \
     F(CallGlobalLookup, callGlobalLookup) \
@@ -131,7 +134,6 @@ QT_BEGIN_NAMESPACE
     F(LoadQmlContext, loadQmlContext) \
     F(LoadQmlIdArray, loadQmlIdArray) \
     F(LoadQmlImportedScripts, loadQmlImportedScripts) \
-    F(LoadQmlContextObject, loadQmlContextObject) \
     F(LoadQmlSingleton, loadQmlSingleton)
 
 #if defined(Q_CC_GNU) && (!defined(Q_CC_INTEL) || __INTEL_COMPILER >= 1200)
@@ -302,6 +304,12 @@ union Instr
         Param base;
         Param result;
     };
+    struct instr_loadContextObjectProperty {
+        MOTH_INSTR_HEADER
+        int propertyIndex;
+        Param base;
+        Param result;
+    };
     struct instr_loadQObjectProperty {
         MOTH_INSTR_HEADER
         int propertyIndex;
@@ -333,6 +341,12 @@ union Instr
         int propertyIndex;
         Param source;
     };
+    struct instr_storeContextObjectProperty {
+        MOTH_INSTR_HEADER
+        Param base;
+        int propertyIndex;
+        Param source;
+    };
     struct instr_storeQObjectProperty {
         MOTH_INSTR_HEADER
         Param base;
@@ -400,6 +414,14 @@ union Instr
         Param base;
         Param result;
     };
+    struct instr_callContextObjectProperty {
+        MOTH_INSTR_HEADER
+        int index;
+        quint32 argc;
+        quint32 callData;
+        Param base;
+        Param result;
+    };
     struct instr_callElement {
         MOTH_INSTR_HEADER
         Param base;
@@ -719,10 +741,6 @@ union Instr
         MOTH_INSTR_HEADER
         Param result;
     };
-    struct instr_loadQmlContextObject {
-        MOTH_INSTR_HEADER
-        Param result;
-    };
     struct instr_loadQmlSingleton {
         MOTH_INSTR_HEADER
         Param result;
@@ -749,17 +767,20 @@ union Instr
     instr_loadProperty loadProperty;
     instr_getLookup getLookup;
     instr_loadScopeObjectProperty loadScopeObjectProperty;
+    instr_loadContextObjectProperty loadContextObjectProperty;
     instr_loadQObjectProperty loadQObjectProperty;
     instr_loadAttachedQObjectProperty loadAttachedQObjectProperty;
     instr_storeProperty storeProperty;
     instr_setLookup setLookup;
     instr_storeScopeObjectProperty storeScopeObjectProperty;
+    instr_storeContextObjectProperty storeContextObjectProperty;
     instr_storeQObjectProperty storeQObjectProperty;
     instr_push push;
     instr_callValue callValue;
     instr_callProperty callProperty;
     instr_callPropertyLookup callPropertyLookup;
     instr_callScopeObjectProperty callScopeObjectProperty;
+    instr_callContextObjectProperty callContextObjectProperty;
     instr_callElement callElement;
     instr_callActivationProperty callActivationProperty;
     instr_callGlobalLookup callGlobalLookup;
@@ -818,7 +839,6 @@ union Instr
     instr_loadQmlContext loadQmlContext;
     instr_loadQmlIdArray loadQmlIdArray;
     instr_loadQmlImportedScripts loadQmlImportedScripts;
-    instr_loadQmlContextObject loadQmlContextObject;
     instr_loadQmlSingleton loadQmlSingleton;
 
     static int size(Type type);