diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-02-01 13:00:46 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-02-09 13:18:28 +0000 |
| commit | 6a2ebc47cfa57dacf5e29083dade8701e1f82bbe (patch) | |
| tree | 6e698a0174f121f4173ddcc54dc0e3f1d359cea8 /src/qml/jsruntime/qv4engine.cpp | |
| parent | 5cef1f6b505939976684c00e8deee614f2c20928 (diff) | |
Fix crashes on WinRT when allocation of executable memory is disabled
This regressed in commit b56f7d6f79b0de73c405b1503bfeb71ef5caf58f. We
need to choose the YARR JIT (as well as the regular JIT) only if we can
allocate executable memory.
Change-Id: I150238fda7b3699cb1d7ffedeeed3c6f3f54132b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 259df976c5..ce29afdb6c 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -120,6 +120,9 @@ QQmlEngine *ExecutionEngine::qmlEngine() const #endif // V4_BOOTSTRAP qint32 ExecutionEngine::maxCallDepth = -1; +#if defined(V4_ENABLE_JIT) && !defined(V4_BOOTSTRAP) +const bool ExecutionEngine::canAllocateExecutableMemory = OSAllocator::canAllocateExecutableMemory(); +#endif ExecutionEngine::ExecutionEngine() : executableAllocator(new QV4::ExecutableAllocator) |