aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/compiler/qv4instr_moth_p.h
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@qt.io>2017-12-08 15:17:38 +0100
committerErik Verbruggen <erik.verbruggen@qt.io>2017-12-08 15:14:13 +0000
commit9bf36df828517059f6af46dac49c1ab07d98e7e7 (patch)
treea748f3fa1e5fcf4847ab77eeae23963da109d14c /src/qml/compiler/qv4instr_moth_p.h
parent74b2574d2a332655007daff619cf741f64d986a3 (diff)
V4: Do not use computed goto's with icc
Otherwise we get: Internal error: assertion failed at: "shared/cfe/edgcpfe/il.c", line 9371 Task-number: QTBUG-64981 Change-Id: I9a4bd81eb9d1ffee23c22f818583c06f9e74433b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4instr_moth_p.h')
-rw-r--r--src/qml/compiler/qv4instr_moth_p.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/compiler/qv4instr_moth_p.h b/src/qml/compiler/qv4instr_moth_p.h
index 0c1b5e240c..a9de71e7ad 100644
--- a/src/qml/compiler/qv4instr_moth_p.h
+++ b/src/qml/compiler/qv4instr_moth_p.h
@@ -301,7 +301,10 @@ QT_BEGIN_NAMESPACE
F(LoadQmlSingleton)
#define MOTH_NUM_INSTRUCTIONS() (static_cast<int>(Moth::Instr::Type::LoadQmlSingleton) + 1)
-#if defined(Q_CC_GNU) && (!defined(Q_CC_INTEL) || __INTEL_COMPILER >= 1200)
+#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL)
+// icc before version 1200 doesn't support computed goto, and at least up to version 18.0.0 the
+// current use results in an internal compiler error. We could enable this if/when it gets fixed
+// in a later version.
# define MOTH_COMPUTED_GOTO
#endif