aboutsummaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@me.com>2013-10-02 14:41:35 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-03 07:06:35 +0200
commitf9305f9ffaf8dd443369a156f7f7650de6372265 (patch)
tree1d9c0e1dbe921b2a96d0ffdcd6111aafb093cdde /src/3rdparty
parentc860d1399b4ff5f3a5b1b2630bc33112c88c13e8 (diff)
V4: invert conditions when the true block follows the test.
Change-Id: I5044acd4263b71734e4eb5d7e74b1a4a8414741e Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/masm/assembler/MacroAssembler.h2
-rw-r--r--src/3rdparty/masm/masm-defs.pri1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssembler.h b/src/3rdparty/masm/assembler/MacroAssembler.h
index f74680d7fc..0c95bc7ca1 100644
--- a/src/3rdparty/masm/assembler/MacroAssembler.h
+++ b/src/3rdparty/masm/assembler/MacroAssembler.h
@@ -90,7 +90,7 @@ public:
static const double twoToThe32; // This is super useful for some double code.
// Utilities used by the DFG JIT.
-#if ENABLE(DFG_JIT)
+#if ENABLE(DFG_JIT) || ENABLE(DFG_JIT_UTILITY_METHODS)
using MacroAssemblerBase::invert;
static DoubleCondition invert(DoubleCondition cond)
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri
index 836ac0c796..ef9f79a42f 100644
--- a/src/3rdparty/masm/masm-defs.pri
+++ b/src/3rdparty/masm/masm-defs.pri
@@ -20,6 +20,7 @@ win*: DEFINES += NOMINMAX
DEFINES += ENABLE_LLINT=0
DEFINES += ENABLE_DFG_JIT=0
+DEFINES += ENABLE_DFG_JIT_UTILITY_METHODS=1
DEFINES += ENABLE_JIT_CONSTANT_BLINDING=0
DEFINES += ENABLE_ASSEMBLER=1
DEFINES += BUILDING_QT__