From 974fc46c3d69c270c0260c877aa4e9a0979edec1 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Thu, 18 Feb 2021 17:33:34 +0100
Subject: QML: Do not JIT-compile AOT-compiled function

The AOT-compiled code is supposed to be the best one if available.

Change-Id: Ib66a3d8e57cf437e0a5e6395f2ec6a0ab21f39c0
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit d446cb746f4e8e84efea8b3afda530d6da52d5f5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/qml/jsruntime/qv4engine_p.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h
index 6d02ffd54b..8a85685539 100644
--- a/src/qml/jsruntime/qv4engine_p.h
+++ b/src/qml/jsruntime/qv4engine_p.h
@@ -677,8 +677,10 @@ public:
 #if QT_CONFIG(qml_jit)
         if (!m_canAllocateExecutableMemory)
             return false;
-        if (f)
-            return !f->isGenerator() && f->interpreterCallCount >= jitCallCountThreshold;
+        if (f) {
+            return !f->aotFunction && !f->isGenerator()
+                    && f->interpreterCallCount >= jitCallCountThreshold;
+        }
         return true;
 #else
         Q_UNUSED(f);
-- 
cgit v1.2.3