From 561a2cec9b95b22783a00b48078b532010357066 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 17 Apr 2019 15:15:52 +0200
Subject: Transform V4_ENABLE_JIT into a feature

This way you can enable or disable the JIT when configuring Qt. The
conditions for the availability of the JIT have also been cleaned up.
There is no reason anymore to artificially restrict availability on x86
and x86_64. The reason for the existence of those clauses are old
problems on windows that have been fixed by now. However, on arm and
arm64, we need a specialization of the cacheFlush() function for each OS
to be supported. Therefore, restrict to the systems for which such a
specialization exists. iOS and tvOS are technically supported and you
can enable the JIT via the feature flag now. Due to Apple's policy we
disable it by default, though.

Change-Id: I5fe2a2bf6799b2d11b7ae7c7a85962bcbf44f919
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 src/qml/jit/qv4assemblercommon.cpp   | 4 ----
 src/qml/jit/qv4assemblercommon_p.h   | 4 +---
 src/qml/jit/qv4baselineassembler.cpp | 4 ----
 src/qml/jit/qv4baselineassembler_p.h | 2 ++
 src/qml/jit/qv4baselinejit.cpp       | 4 ----
 src/qml/jit/qv4baselinejit_p.h       | 4 +---
 6 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'src/qml/jit')

diff --git a/src/qml/jit/qv4assemblercommon.cpp b/src/qml/jit/qv4assemblercommon.cpp
index dd810d9d70..800ee22cd7 100644
--- a/src/qml/jit/qv4assemblercommon.cpp
+++ b/src/qml/jit/qv4assemblercommon.cpp
@@ -53,8 +53,6 @@
 
 #undef ENABLE_ALL_ASSEMBLERS_FOR_REFACTORING_PURPOSES
 
-#ifdef V4_ENABLE_JIT
-
 QT_BEGIN_NAMESPACE
 namespace QV4 {
 namespace JIT {
@@ -366,5 +364,3 @@ void PlatformAssemblerCommon::storeInt32AsValue(int srcInt, Address destAddr)
 } // QV4 namepsace
 
 QT_END_NAMESPACE
-
-#endif // V4_ENABLE_JIT
diff --git a/src/qml/jit/qv4assemblercommon_p.h b/src/qml/jit/qv4assemblercommon_p.h
index d3d7eedae2..e5c2aff1a7 100644
--- a/src/qml/jit/qv4assemblercommon_p.h
+++ b/src/qml/jit/qv4assemblercommon_p.h
@@ -58,7 +58,7 @@
 #include <wtf/Vector.h>
 #include <assembler/MacroAssembler.h>
 
-#ifdef V4_ENABLE_JIT
+QT_REQUIRE_CONFIG(qml_jit);
 
 QT_BEGIN_NAMESPACE
 
@@ -735,6 +735,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // V4_ENABLE_JIT
-
 #endif // QV4PLATFORMASSEMBLER_P_H
diff --git a/src/qml/jit/qv4baselineassembler.cpp b/src/qml/jit/qv4baselineassembler.cpp
index 238c11f478..5e34087ff5 100644
--- a/src/qml/jit/qv4baselineassembler.cpp
+++ b/src/qml/jit/qv4baselineassembler.cpp
@@ -55,8 +55,6 @@
 
 #undef ENABLE_ALL_ASSEMBLERS_FOR_REFACTORING_PURPOSES
 
-#ifdef V4_ENABLE_JIT
-
 QT_BEGIN_NAMESPACE
 namespace QV4 {
 namespace JIT {
@@ -1620,5 +1618,3 @@ void BaselineAssembler::ret()
 } // QV4 namepsace
 
 QT_END_NAMESPACE
-
-#endif // V4_ENABLE_JIT
diff --git a/src/qml/jit/qv4baselineassembler_p.h b/src/qml/jit/qv4baselineassembler_p.h
index 3bbaefd000..5e5d9d0672 100644
--- a/src/qml/jit/qv4baselineassembler_p.h
+++ b/src/qml/jit/qv4baselineassembler_p.h
@@ -55,6 +55,8 @@
 #include <private/qv4function_p.h>
 #include <QHash>
 
+QT_REQUIRE_CONFIG(qml_jit);
+
 QT_BEGIN_NAMESPACE
 
 namespace QV4 {
diff --git a/src/qml/jit/qv4baselinejit.cpp b/src/qml/jit/qv4baselinejit.cpp
index 80155d7b20..60880419a6 100644
--- a/src/qml/jit/qv4baselinejit.cpp
+++ b/src/qml/jit/qv4baselinejit.cpp
@@ -42,8 +42,6 @@
 #include <private/qv4lookup_p.h>
 #include <private/qv4generatorobject_p.h>
 
-#ifdef V4_ENABLE_JIT
-
 QT_USE_NAMESPACE
 using namespace QV4;
 using namespace QV4::JIT;
@@ -913,5 +911,3 @@ void BaselineJIT::endInstruction(Instr::Type instr)
 {
     Q_UNUSED(instr);
 }
-
-#endif // V4_ENABLE_JIT
diff --git a/src/qml/jit/qv4baselinejit_p.h b/src/qml/jit/qv4baselinejit_p.h
index 37ab37eac2..941e0cd408 100644
--- a/src/qml/jit/qv4baselinejit_p.h
+++ b/src/qml/jit/qv4baselinejit_p.h
@@ -56,7 +56,7 @@
 #include <private/qv4instr_moth_p.h>
 #include <private/qv4bytecodehandler_p.h>
 
-//QT_REQUIRE_CONFIG(qml_jit);
+QT_REQUIRE_CONFIG(qml_jit);
 
 QT_BEGIN_NAMESPACE
 
@@ -65,7 +65,6 @@ namespace JIT {
 
 class BaselineAssembler;
 
-#ifdef V4_ENABLE_JIT
 class BaselineJIT final: public Moth::ByteCodeHandler
 {
 public:
@@ -214,7 +213,6 @@ private:
     QScopedPointer<BaselineAssembler> as;
     QSet<int> labels;
 };
-#endif // V4_ENABLE_JIT
 
 } // namespace JIT
 } // namespace QV4
-- 
cgit v1.2.3