diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-02-21 15:12:45 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-21 16:02:56 +0100 |
| commit | 33a75345e35d3d1a47f0258c39b480dd5e1487d8 (patch) | |
| tree | 6e945803af4bec8618b7b30cc4de981c711543e7 /Source/JavaScriptCore/bytecode/CodeBlock.cpp | |
| parent | 0ee653a310e269b4393becda0954e90a3c9e4344 (diff) | |
| download | qtwebkit-33a75345e35d3d1a47f0258c39b480dd5e1487d8.tar.gz | |
Fix Qt WebKit build on architectures without JIT support
The fallback LLINT interpreter was triggering YARR JIT which would
fail to compile and also trigger ENABLE_ASSEMBLER which would trigger
even more not to compile. YARR JIT is only supported on platforms with
valid JIT or native LLINT support. So we must avoid it when the fallback
is used
Task-number: QTBUG-36969
Change-Id: Ie94bcb316e192feb33ab528ddc3a328af154cebf
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source/JavaScriptCore/bytecode/CodeBlock.cpp')
| -rw-r--r-- | Source/JavaScriptCore/bytecode/CodeBlock.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/bytecode/CodeBlock.cpp b/Source/JavaScriptCore/bytecode/CodeBlock.cpp index 904e40a4c..efe4424c2 100644 --- a/Source/JavaScriptCore/bytecode/CodeBlock.cpp +++ b/Source/JavaScriptCore/bytecode/CodeBlock.cpp @@ -2947,8 +2947,12 @@ void CodeBlock::countReoptimization() unsigned CodeBlock::numberOfDFGCompiles() { +#if ENABLE(JIT) ASSERT(JITCode::isBaselineCode(getJITType())); return (JITCode::isOptimizingJIT(replacement()->getJITType()) ? 1 : 0) + m_reoptimizationRetryCounter; +#else + return 0; +#endif } int32_t CodeBlock::codeTypeThresholdMultiplier() const |