Qml JavaScript code generation cleanups

* Run the binding expressions, functions and signal handlers through
  the V4 codegen _per_ component, and run the isel at the end for the
  entire file. We need to do per-component codegen because we want to
  set up the correct id and object scopes, which are different for the
  root component and anonymous components.
* Changed V4IR::Module to allow for the concept of "qml modules" where
  there is no root function defined. This is a logical consequence of
  running v4 codegen multiple times with different input but the same
  V4IR::Module.

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

1 files changed, 11 insertions, 15 deletions

diff --git a/src/qml/qml/qqmlcompiler_p.h b/src/qml/qml/qqmlcompiler_p.h
index c8e5c907e0..142d8c68b1 100644
--- a/src/qml/qml/qqmlcompiler_p.h
+++ b/src/qml/qml/qqmlcompiler_p.h
@@ -302,6 +302,16 @@ namespace QQmlCompilerTypes {
         typedef QFieldList<O, &O::nextAliasingObject> AliasingObjectsList;
         AliasingObjectsList aliasingObjects;
         QQmlScript::Object *root;
+        QList<QQmlJS::AST::Node*> functionsToCompile;
+        QVector<int> runtimeFunctionIndices;
+
+        struct CompiledMetaMethod
+        {
+            QQmlScript::Object *obj;
+            int methodIndex;
+            int compiledFunctionIndex; // index in functionToCompile
+        };
+        QList<CompiledMetaMethod> compiledMetaMethods;
     };
 };
 
@@ -461,21 +471,7 @@ private:
     int cachedComponentTypeRef;
     int cachedTranslationContextIndex;
 
-    QList<QQmlJS::AST::Node*> functionsToCompile;
-    QList<QQmlCompilerTypes::JSBindingReference*> allBindingReferenceRoots;
-    struct CompiledMetaMethod
-    {
-        QQmlScript::Object *obj;
-        int methodIndex;
-        int compiledFunctionIndex; // index in functionToCompile
-    };
-    QList<CompiledMetaMethod> compiledMetaMethods;
-    struct CompiledSignalHandlerExpression
-    {
-        QQmlScript::Value *signal;
-        int compiledHandlerIndex; // index in functionsToCompile
-    };
-    QList<CompiledSignalHandlerExpression> compiledSignalHandlers;
+    QScopedPointer<QQmlJS::V4IR::Module> jsModule;
 
     // Compiler component statistics.  Only collected if QML_COMPILER_STATS=1
     struct ComponentStat