diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2021-02-18 17:33:34 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-19 00:29:47 +0000 |
| commit | 974fc46c3d69c270c0260c877aa4e9a0979edec1 (patch) | |
| tree | 1a697e8e5c5e9f42f026d1e43b9ae0190b978e94 | |
| parent | de1d3a3e1c5e8748c31c83f73b771f2f6b1b1bc7 (diff) | |
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>
| -rw-r--r-- | src/qml/jsruntime/qv4engine_p.h | 6 |
1 files 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); |