Revert "QML: When available, use QQmlAccessors to read properties."

This reverts commit f6fee09942de7901a708c4e16db0c7c82550e8c5. The accessor
pointers were embedded in the generated machine/byte code, which makes it
non-relocatable. As discussed, for the moment the ability to have relocatable
code is prioritized. But the goal is to re-enable accessor accelerated property
access through lookups.

Change-Id: I18ec9ce31901c1fae3e58ac0c41bc87791e8c380
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 0 insertions, 90 deletions

diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index 93043135a4..93a7170e68 100644
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -81,19 +81,9 @@ QT_BEGIN_NAMESPACE
     F(SetLookup, setLookup) \
     F(StoreQObjectProperty, storeQObjectProperty) \
     F(LoadQObjectProperty, loadQObjectProperty) \
-    F(LoadQRealQObjectPropertyDirectly, loadQRealQObjectPropertyDirectly) \
-    F(LoadQObjectQObjectPropertyDirectly, loadQObjectQObjectPropertyDirectly) \
-    F(LoadIntQObjectPropertyDirectly, loadIntQObjectPropertyDirectly) \
-    F(LoadBoolQObjectPropertyDirectly, loadBoolQObjectPropertyDirectly) \
-    F(LoadQStringQObjectPropertyDirectly, loadQStringQObjectPropertyDirectly) \
     F(StoreScopeObjectProperty, storeScopeObjectProperty) \
     F(StoreContextObjectProperty, storeContextObjectProperty) \
     F(LoadScopeObjectProperty, loadScopeObjectProperty) \
-    F(LoadScopeObjectQRealPropertyDirectly, loadScopeObjectQRealPropertyDirectly) \
-    F(LoadScopeObjectQObjectPropertyDirectly, loadScopeObjectQObjectPropertyDirectly) \
-    F(LoadScopeObjectIntPropertyDirectly, loadScopeObjectIntPropertyDirectly) \
-    F(LoadScopeObjectBoolPropertyDirectly, loadScopeObjectBoolPropertyDirectly) \
-    F(LoadScopeObjectQStringPropertyDirectly, loadScopeObjectQStringPropertyDirectly) \
     F(LoadContextObjectProperty, loadContextObjectProperty) \
     F(LoadIdObject, loadIdObject) \
     F(LoadAttachedQObjectProperty, loadAttachedQObjectProperty) \
@@ -333,36 +323,6 @@ union Instr
         Param base;
         Param result;
     };
-    struct instr_loadScopeObjectQRealPropertyDirectly {
-        MOTH_INSTR_HEADER
-        Param base;
-        Param result;
-        QQmlAccessors *accessors;
-    };
-    struct instr_loadScopeObjectQObjectPropertyDirectly {
-        MOTH_INSTR_HEADER
-        Param base;
-        Param result;
-        QQmlAccessors *accessors;
-    };
-    struct instr_loadScopeObjectIntPropertyDirectly {
-        MOTH_INSTR_HEADER
-        Param base;
-        Param result;
-        QQmlAccessors *accessors;
-    };
-    struct instr_loadScopeObjectBoolPropertyDirectly {
-        MOTH_INSTR_HEADER
-        Param base;
-        Param result;
-        QQmlAccessors *accessors;
-    };
-    struct instr_loadScopeObjectQStringPropertyDirectly {
-        MOTH_INSTR_HEADER
-        Param base;
-        Param result;
-        QQmlAccessors *accessors;
-    };
     struct instr_loadContextObjectProperty {
         MOTH_INSTR_HEADER
         int propertyIndex;
@@ -382,46 +342,6 @@ union Instr
         Param result;
         bool captureRequired;
     };
-    struct instr_loadQRealQObjectPropertyDirectly {
-        MOTH_INSTR_HEADER
-        Param base;
-        Param result;
-        QQmlAccessors *accessors;
-        int coreIndex;
-        int notifyIndex;
-    };
-    struct instr_loadQObjectQObjectPropertyDirectly {
-        MOTH_INSTR_HEADER
-        Param base;
-        Param result;
-        QQmlAccessors *accessors;
-        int coreIndex;
-        int notifyIndex;
-    };
-    struct instr_loadIntQObjectPropertyDirectly {
-        MOTH_INSTR_HEADER
-        Param base;
-        Param result;
-        QQmlAccessors *accessors;
-        int coreIndex;
-        int notifyIndex;
-    };
-    struct instr_loadBoolQObjectPropertyDirectly {
-        MOTH_INSTR_HEADER
-        Param base;
-        Param result;
-        QQmlAccessors *accessors;
-        int coreIndex;
-        int notifyIndex;
-    };
-    struct instr_loadQStringQObjectPropertyDirectly {
-        MOTH_INSTR_HEADER
-        Param base;
-        Param result;
-        QQmlAccessors *accessors;
-        int coreIndex;
-        int notifyIndex;
-    };
     struct instr_loadAttachedQObjectProperty {
         MOTH_INSTR_HEADER
         int propertyIndex;
@@ -880,19 +800,9 @@ union Instr
     instr_loadProperty loadProperty;
     instr_getLookup getLookup;
     instr_loadScopeObjectProperty loadScopeObjectProperty;
-    instr_loadScopeObjectQRealPropertyDirectly loadScopeObjectQRealPropertyDirectly;
-    instr_loadScopeObjectQObjectPropertyDirectly loadScopeObjectQObjectPropertyDirectly;
-    instr_loadScopeObjectIntPropertyDirectly loadScopeObjectIntPropertyDirectly;
-    instr_loadScopeObjectBoolPropertyDirectly loadScopeObjectBoolPropertyDirectly;
-    instr_loadScopeObjectQStringPropertyDirectly loadScopeObjectQStringPropertyDirectly;
     instr_loadContextObjectProperty loadContextObjectProperty;
     instr_loadIdObject loadIdObject;
     instr_loadQObjectProperty loadQObjectProperty;
-    instr_loadQRealQObjectPropertyDirectly loadQRealQObjectPropertyDirectly;
-    instr_loadQObjectQObjectPropertyDirectly loadQObjectQObjectPropertyDirectly;
-    instr_loadIntQObjectPropertyDirectly loadIntQObjectPropertyDirectly;
-    instr_loadBoolQObjectPropertyDirectly loadBoolQObjectPropertyDirectly;
-    instr_loadQStringQObjectPropertyDirectly loadQStringQObjectPropertyDirectly;
     instr_loadAttachedQObjectProperty loadAttachedQObjectProperty;
     instr_storeProperty storeProperty;
     instr_setLookup setLookup;