Title: [163491] tags/Safari-538.16.2/Source/_javascript_Core
Diff
Modified: tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog (163490 => 163491)
--- tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog 2014-02-06 00:46:36 UTC (rev 163490)
+++ tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog 2014-02-06 00:48:20 UTC (rev 163491)
@@ -1,5 +1,16 @@
2014-02-05 Lucas Forschler <[email protected]>
+ Merge r163420
+
+ 2014-02-04 Mark Hahnenberg <[email protected]>
+
+ Fix !ENABLE(JIT) builds after r163418
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::reoptimizationRetryCounter): Return 0 if there's no way for us to reoptimize.
+
+2014-02-05 Lucas Forschler <[email protected]>
+
Merge r163418
2014-02-04 Filip Pizlo <[email protected]>
Modified: tags/Safari-538.16.2/Source/_javascript_Core/bytecode/CodeBlock.cpp (163490 => 163491)
--- tags/Safari-538.16.2/Source/_javascript_Core/bytecode/CodeBlock.cpp 2014-02-06 00:46:36 UTC (rev 163490)
+++ tags/Safari-538.16.2/Source/_javascript_Core/bytecode/CodeBlock.cpp 2014-02-06 00:48:20 UTC (rev 163491)
@@ -2916,13 +2916,17 @@
#endif
}
-#if ENABLE(JIT)
unsigned CodeBlock::reoptimizationRetryCounter() const
{
+#if ENABLE(JIT)
ASSERT(m_reoptimizationRetryCounter <= Options::reoptimizationRetryCounterMax());
return m_reoptimizationRetryCounter;
+#else
+ return 0;
+#endif // ENABLE(JIT)
}
+#if ENABLE(JIT)
void CodeBlock::countReoptimization()
{
m_reoptimizationRetryCounter++;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
