IR Cleanup, resolve ID objects through array subscripts

...instead of a special MEMBER type. This allows removing the
type member from V4IR::Member altogether (and thus unshadow from
V4IR::Expr::type). By not requiring the base of a id lookup
member expression to be a NAME, we can also speed up repeated
id lookups by fetching the id object array wrapper only once
per function.

Change-Id: I3e9b8f498d32ace4a0cc2254f49e02ecc124f79c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/src/qml/qml/qqmlcontextwrapper_p.h b/src/qml/qml/qqmlcontextwrapper_p.h
index d85f440b15..603a5af2fd 100644
--- a/src/qml/qml/qqmlcontextwrapper_p.h
+++ b/src/qml/qml/qqmlcontextwrapper_p.h
@@ -69,6 +69,8 @@ namespace CompiledData {
 struct Function;
 }
 
+struct QQmlIdObjectsArray;
+
 struct Q_QML_EXPORT QmlContextWrapper : Object
 {
     Q_MANAGED
@@ -90,9 +92,11 @@ struct Q_QML_EXPORT QmlContextWrapper : Object
     static ReturnedValue get(Managed *m, const StringRef name, bool *hasProperty);
     static void put(Managed *m, const StringRef name, const ValueRef value);
     static void destroy(Managed *that);
+    static void markObjects(Managed *m, ExecutionEngine *engine);
 
     static void registerQmlDependencies(ExecutionEngine *context, const CompiledData::Function *compiledFunction);
 
+    ReturnedValue idObjectsArray();
 
     QV8Engine *v8; // ### temporary, remove
     bool readOnly;
@@ -101,6 +105,19 @@ struct Q_QML_EXPORT QmlContextWrapper : Object
 
     QQmlGuardedContextData context;
     QPointer<QObject> scopeObject;
+private:
+    QQmlIdObjectsArray *idObjectsWrapper;
+};
+
+struct QQmlIdObjectsArray : public Object
+{
+    Q_MANAGED
+    QQmlIdObjectsArray(ExecutionEngine *engine, QmlContextWrapper *contextWrapper);
+
+    static ReturnedValue getIndexed(Managed *m, uint index, bool *hasProperty);
+    static void markObjects(Managed *that, ExecutionEngine *engine);
+
+    QmlContextWrapper *contextWrapper;
 };
 
 }