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, 12 insertions, 4 deletions

diff --git a/src/qml/compiler/qqmlcodegenerator_p.h b/src/qml/compiler/qqmlcodegenerator_p.h
index 1b72e96097..43bc979205 100644
--- a/src/qml/compiler/qqmlcodegenerator_p.h
+++ b/src/qml/compiler/qqmlcodegenerator_p.h
@@ -55,6 +55,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QQmlTypeNameCache;
+
 namespace QtQml {
 
 using namespace QQmlJS;
@@ -346,7 +348,7 @@ private:
 struct Q_QML_EXPORT JSCodeGen : public QQmlJS::Codegen
 {
     JSCodeGen(const QString &fileName, const QString &sourceCode, V4IR::Module *jsModule,
-              QQmlJS::Engine *jsEngine, AST::UiProgram *qmlRoot);
+              QQmlJS::Engine *jsEngine, AST::UiProgram *qmlRoot, QQmlTypeNameCache *imports);
 
     struct IdMapping
     {
@@ -355,18 +357,24 @@ struct Q_QML_EXPORT JSCodeGen : public QQmlJS::Codegen
     };
     typedef QVector<IdMapping> ObjectIdMapping;
 
+    void beginContextScope(const ObjectIdMapping &objectIds, QQmlPropertyCache *contextObject);
+    void beginObjectScope(QQmlPropertyCache *scopeObject);
+
     // Returns mapping from input functions to index in V4IR::Module::functions / compiledData->runtimeFunctions
-    QVector<int> generateJSCodeForFunctionsAndBindings(AST::Node *contextRoot, const QList<AST::Node*> &functions, const ObjectIdMapping &objectIds = ObjectIdMapping());
+    QVector<int> generateJSCodeForFunctionsAndBindings(const QList<AST::Node*> &functions);
 
 protected:
-    virtual V4IR::Expr *fallbackNameLookup(const QString &name, int line, int col) const;
+    virtual V4IR::Expr *fallbackNameLookup(const QString &name, int line, int col);
 
 private:
     QString sourceCode;
     QQmlJS::Engine *jsEngine; // needed for memory pool
     AST::UiProgram *qmlRoot;
+    QQmlTypeNameCache *imports;
 
-    ObjectIdMapping idObjects;
+    ObjectIdMapping _idObjects;
+    QQmlPropertyCache *_contextObject;
+    QQmlPropertyCache *_scopeObject;
 };
 
 } // namespace QtQml