From d5ab38b606fa63e6da1425b6fa607f55b3877007 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 4 Jul 2017 09:58:43 +0200
Subject: Properly save/restore the QML temps between functions

This only worked by chance before, as they always for the
same temp indices.

Change-Id: Ib2c8b912fa1dee8b1f12c8f9d895bc023bc265d3
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
---
 src/qml/compiler/qqmlirbuilder.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/qml/compiler/qqmlirbuilder.cpp')

diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index 312ddd753b..f34a797508 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -1650,6 +1650,21 @@ QVector<int> JSCodeGen::generateJSCodeForFunctionsAndBindings(const QList<Compil
     return runtimeFunctionIndices;
 }
 
+int JSCodeGen::defineFunction(const QString &name, AST::Node *ast, AST::FormalParameterList *formals, AST::SourceElements *body)
+{
+    int qmlContextTemp = -1;
+    int importedScriptsTemp = -1;
+    qSwap(_qmlContextTemp, qmlContextTemp);
+    qSwap(_importedScriptsTemp, importedScriptsTemp);
+
+    int result = Codegen::defineFunction(name, ast, formals, body);
+
+    qSwap(_importedScriptsTemp, importedScriptsTemp);
+    qSwap(_qmlContextTemp, qmlContextTemp);
+
+    return result;
+}
+
 #ifndef V4_BOOTSTRAP
 QQmlPropertyData *JSCodeGen::lookupQmlCompliantProperty(QQmlPropertyCache *cache, const QString &name)
 {
-- 
cgit v1.2.3