diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-24 20:04:40 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-24 20:04:40 +0100 |
commit | 429b2c361376ebe23458c1258203b8f9c0bab47d (patch) | |
tree | 2b2864081e41399f5a12bb38b3711d954102c56c /Source/JavaScriptCore/bytecode/CodeBlock.cpp | |
parent | e75e28cd3fdedb761b951c8def38419c0487226c (diff) | |
parent | 33a75345e35d3d1a47f0258c39b480dd5e1487d8 (diff) | |
download | qtwebkit-429b2c361376ebe23458c1258203b8f9c0bab47d.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ic5f96bd405f680ef9ea667746a7490837ccc40c9
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 |