Compiler: Extract Basic blocks generation into its own compiler pass

The old basic blocks pass was responsible for two things: the basic
blocks generation and dead code analysis/type adjustments based on
those blocks and the type propagation performed earlier.

Now the basic blocks get generated first, even before the type
propagation and the dead code analysis and type adjustments are now
grouped in a pass called QQmlJSOptimizations. The rest of the passes
remain unchanged.

Change-Id: I7b4303eaf67c761a49b82ab194e5d035d24d2615
Reviewed-by: Fabian Kosmale <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>

1 files changed, 5 insertions, 6 deletions

diff --git a/src/qmlcompiler/qqmljsstoragegeneralizer.cpp b/src/qmlcompiler/qqmljsstoragegeneralizer.cpp
index 543dec9ff6..077c1dcc01 100644
--- a/src/qmlcompiler/qqmljsstoragegeneralizer.cpp
+++ b/src/qmlcompiler/qqmljsstoragegeneralizer.cpp
@@ -19,9 +19,8 @@ QT_BEGIN_NAMESPACE
  * operates only on the annotations and the function description.
  */
 
-QQmlJSCompilePass::InstructionAnnotations QQmlJSStorageGeneralizer::run(
-        InstructionAnnotations annotations, Function *function,
-        QQmlJS::DiagnosticMessage *error)
+QQmlJSCompilePass::BlocksAndAnnotations
+QQmlJSStorageGeneralizer::run(Function *function, QQmlJS::DiagnosticMessage *error)
 {
     m_error = error;
 
@@ -32,7 +31,7 @@ QQmlJSCompilePass::InstructionAnnotations QQmlJSStorageGeneralizer::run(
         } else {
             setError(QStringLiteral("Cannot store the return type %1.")
                      .arg(returnType->internalName(), 0));
-            return InstructionAnnotations();
+            return {};
         }
     }
 
@@ -53,12 +52,12 @@ QQmlJSCompilePass::InstructionAnnotations QQmlJSStorageGeneralizer::run(
         transformRegister(argument);
     }
 
-    for (auto i = annotations.begin(), iEnd = annotations.end(); i != iEnd; ++i) {
+    for (auto i = m_annotations.begin(), iEnd = m_annotations.end(); i != iEnd; ++i) {
         transformRegister(i->second.changedRegister);
         transformRegisters(i->second.typeConversions);
     }
 
-    return annotations;
+    return { std::move(m_basicBlocks), std::move(m_annotations) };
 }
 
 QT_END_NAMESPACE