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, 3 insertions, 9 deletions

diff --git a/src/qml/compiler/qv4isel_p.cpp b/src/qml/compiler/qv4isel_p.cpp
index b3407867b4..a14a11c43e 100644
--- a/src/qml/compiler/qv4isel_p.cpp
+++ b/src/qml/compiler/qv4isel_p.cpp
@@ -103,6 +103,8 @@ void IRDecoder::visitMove(V4IR::Move *s)
         if (V4IR::Name *n = s->source->asName()) {
             if (n->id && *n->id == QStringLiteral("this")) // TODO: `this' should be a builtin.
                 loadThisObject(t);
+            else if (n->builtin == V4IR::Name::builtin_qml_id_array)
+                loadQmlIdArray(t);
             else if (n->builtin == V4IR::Name::builtin_qml_context_object)
                 loadQmlContextObject(t);
             else if (n->builtin == V4IR::Name::builtin_qml_scope_object)
@@ -142,15 +144,7 @@ void IRDecoder::visitMove(V4IR::Move *s)
                 return;
             }
         } else if (V4IR::Member *m = s->source->asMember()) {
-            if (m->type == V4IR::Member::MemberOfQmlContext) {
-                V4IR::Name *base = m->base->asName();
-                Q_ASSERT(base);
-
-                if (base->builtin == V4IR::Name::builtin_qml_id_scope) {
-                    loadQmlIdObject(m->memberIndex, t);
-                    return;
-                }
-            } else if (m->property) {
+            if (m->property) {
                 bool captureRequired = true;
                 if (_function) {
                     captureRequired = !_function->contextObjectDependencies.contains(m->property)