Initial support for resolving meta-property access for the scope and context objects at QML compile time

This avoids having to do a string lookup for ids and in the import cache at
run-time, before we can do a string hash lookup in the property cache. Instead
we resolve final properties in the context and scope object at compile time and
look them up at run-time using their index instead. The dependencies to these
properties are also tracked separately and recorded in the compiled data.

This is merely the initial patch. There's a lot left to do, such as having
specialized getter and setters for specific property types. Setters are missing
altogether right now and will fall back to name lookup.

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

1 files changed, 9 insertions, 1 deletions

diff --git a/src/qml/compiler/qv4isel_p.cpp b/src/qml/compiler/qv4isel_p.cpp
index b9341163de..1a56ddabf1 100644
--- a/src/qml/compiler/qv4isel_p.cpp
+++ b/src/qml/compiler/qv4isel_p.cpp
@@ -46,6 +46,7 @@
 #include "qv4isel_util_p.h"
 #include "qv4functionobject_p.h"
 #include "qv4function_p.h"
+#include <private/qqmlpropertycache_p.h>
 
 #include <QString>
 
@@ -100,8 +101,12 @@ void IRDecoder::visitMove(V4IR::Move *s)
         }
     } else if (V4IR::Temp *t = s->target->asTemp()) {
         if (V4IR::Name *n = s->source->asName()) {
-            if (*n->id == QStringLiteral("this")) // TODO: `this' should be a builtin.
+            if (n->id && *n->id == QStringLiteral("this")) // TODO: `this' should be a builtin.
                 loadThisObject(t);
+            else if (n->builtin == V4IR::Name::builtin_qml_context_object)
+                loadQmlContextObject(t);
+            else if (n->builtin == V4IR::Name::builtin_qml_scope_object)
+                loadQmlScopeObject(t);
             else
                 getActivationProperty(n, t);
             return;
@@ -138,6 +143,9 @@ void IRDecoder::visitMove(V4IR::Move *s)
             if (m->type == V4IR::Member::MemberByObjectId) {
                 loadIdObject(m->objectId, t);
                 return;
+            } else if (m->type == V4IR::Member::MemberOfQObject) {
+                getQObjectProperty(m->base, m->property->coreIndex, t);
+                return;
             } else if (m->base->asTemp() || m->base->asConst()) {
                 getProperty(m->base, *m->name, t);
                 return;