Diff
Modified: tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog (163539 => 163540)
--- tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog 2014-02-06 17:49:32 UTC (rev 163539)
+++ tags/Safari-538.16.2/Source/_javascript_Core/ChangeLog 2014-02-06 17:50:32 UTC (rev 163540)
@@ -1,3 +1,17 @@
+2014-02-06 Lucas Forschler <[email protected]>
+
+ Merge r163481
+
+ 2014-02-05 Filip Pizlo <[email protected]>
+
+ Rename useExperimentalFTL to useFTLJIT.
+
+ Rubber stamped by Mark Hahnenberg.
+
+ * dfg/DFGTierUpCheckInjectionPhase.cpp:
+ (JSC::DFG::TierUpCheckInjectionPhase::run):
+ * runtime/Options.h:
+
2014-02-05 Lucas Forschler <[email protected]>
Merge r163474
Modified: tags/Safari-538.16.2/Source/_javascript_Core/dfg/DFGTierUpCheckInjectionPhase.cpp (163539 => 163540)
--- tags/Safari-538.16.2/Source/_javascript_Core/dfg/DFGTierUpCheckInjectionPhase.cpp 2014-02-06 17:49:32 UTC (rev 163539)
+++ tags/Safari-538.16.2/Source/_javascript_Core/dfg/DFGTierUpCheckInjectionPhase.cpp 2014-02-06 17:50:32 UTC (rev 163540)
@@ -47,7 +47,7 @@
{
RELEASE_ASSERT(m_graph.m_plan.mode == DFGMode);
- if (!Options::useExperimentalFTL())
+ if (!Options::useFTLJIT())
return false;
if (m_graph.m_profiledBlock->m_didFailFTLCompilation)
Modified: tags/Safari-538.16.2/Source/_javascript_Core/runtime/Options.h (163539 => 163540)
--- tags/Safari-538.16.2/Source/_javascript_Core/runtime/Options.h 2014-02-06 17:49:32 UTC (rev 163539)
+++ tags/Safari-538.16.2/Source/_javascript_Core/runtime/Options.h 2014-02-06 17:50:32 UTC (rev 163540)
@@ -136,7 +136,7 @@
v(bool, enableOSREntryToDFG, true) \
v(bool, enableOSREntryToFTL, true) \
\
- v(bool, useExperimentalFTL, false) \
+ v(bool, useFTLJIT, false) \
v(bool, enableExperimentalFTLCoverage, false) \
v(bool, useFTLTBAA, true) \
v(bool, enableLLVMFastISel, false) \
Modified: tags/Safari-538.16.2/Tools/ChangeLog (163539 => 163540)
--- tags/Safari-538.16.2/Tools/ChangeLog 2014-02-06 17:49:32 UTC (rev 163539)
+++ tags/Safari-538.16.2/Tools/ChangeLog 2014-02-06 17:50:32 UTC (rev 163540)
@@ -1,3 +1,15 @@
+2014-02-06 Lucas Forschler <[email protected]>
+
+ Merge r163481
+
+ 2014-02-05 Filip Pizlo <[email protected]>
+
+ Rename useExperimentalFTL to useFTLJIT.
+
+ Rubber stamped by Mark Hahnenberg.
+
+ * Scripts/run-jsc-stress-tests:
+
2014-02-05 Lucas Forschler <[email protected]>
Merge r163474
Modified: tags/Safari-538.16.2/Tools/Scripts/run-jsc-stress-tests (163539 => 163540)
--- tags/Safari-538.16.2/Tools/Scripts/run-jsc-stress-tests 2014-02-06 17:49:32 UTC (rev 163539)
+++ tags/Safari-538.16.2/Tools/Scripts/run-jsc-stress-tests 2014-02-06 17:50:32 UTC (rev 163540)
@@ -180,7 +180,7 @@
EAGER_OPTIONS = ["--thresholdForJITAfterWarmUp=10", "--thresholdForJITSoon=10", "--thresholdForOptimizeAfterWarmUp=20", "--thresholdForOptimizeAfterLongWarmUp=20", "--thresholdForOptimizeSoon=20", "--thresholdForFTLOptimizeAfterWarmUp=20", "--thresholdForFTLOptimizeSoon=20"]
-FTL_OPTIONS = ["--useExperimentalFTL=true", "--enableExperimentalFTLCoverage=true"]
+FTL_OPTIONS = ["--useFTLJIT=true", "--enableExperimentalFTLCoverage=true"]
$runlist = []
