diff options
author | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-08-22 16:00:40 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-28 11:48:52 +0000 |
commit | b56f7d6f79b0de73c405b1503bfeb71ef5caf58f (patch) | |
tree | 2be72b905ea8fe55df4efba6a724e3af1cd953bb | |
parent | 8ff7ce3c430d1f981e72bb588fc5710cca6272d0 (diff) |
Re-enable the YarrJIT
This makes a huge difference for regexp evaluation.
Change-Id: I6b466f60280583c85d34be8734e8fef209b7b989
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 3 | ||||
-rw-r--r-- | src/qml/jsruntime/qv4regexp.cpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index d50669a24e..4c5e3c4e5e 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -118,9 +118,6 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } #endif #endif -// ### for now we only work with the interpreter -#undef V4_ENABLE_JIT - // For debug purposes: add CONFIG+=force-compile-jit to qmake's command-line to always compile the JIT. #if defined(V4_FORCE_COMPILE_JIT) && !defined(V4_ENABLE_JIT) # define V4_ENABLE_JIT diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp index 6778145ff1..fa3cbb5bcc 100644 --- a/src/qml/jsruntime/qv4regexp.cpp +++ b/src/qml/jsruntime/qv4regexp.cpp @@ -106,7 +106,7 @@ void Heap::RegExp::init(ExecutionEngine* engine, const QString &pattern, bool ig byteCode = p.take(); #if ENABLE(YARR_JIT) jitCode = new JSC::Yarr::YarrCodeBlock; - if (!yarrPattern.m_containsBackreferences && engine->iselFactory->jitCompileRegexps()) { + if (!yarrPattern.m_containsBackreferences) { JSC::JSGlobalData dummy(engine->regExpAllocator); JSC::Yarr::jitCompile(yarrPattern, JSC::Yarr::Char16, &dummy, *jitCode); } |