Title: [161734] branches/jsCStack/Source/_javascript_Core
- Revision
- 161734
- Author
- [email protected]
- Date
- 2014-01-10 21:33:47 -0800 (Fri, 10 Jan 2014)
Log Message
Unreviewed, unbreak all tests by undoing some assertions junk in
http://trac.webkit.org/changeset/161732 and changing typo "node->function()"
which should have been "node->executable()".
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileCheckExecutable):
* runtime/Options.cpp:
(JSC::recomputeDependentOptions):
(JSC::Options::initialize):
Modified Paths
Diff
Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (161733 => 161734)
--- branches/jsCStack/Source/_javascript_Core/ChangeLog 2014-01-11 05:18:34 UTC (rev 161733)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog 2014-01-11 05:33:47 UTC (rev 161734)
@@ -1,5 +1,17 @@
2014-01-10 Filip Pizlo <[email protected]>
+ Unreviewed, unbreak all tests by undoing some assertions junk in
+ http://trac.webkit.org/changeset/161732 and changing typo "node->function()"
+ which should have been "node->executable()".
+
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileCheckExecutable):
+ * runtime/Options.cpp:
+ (JSC::recomputeDependentOptions):
+ (JSC::Options::initialize):
+
+2014-01-10 Filip Pizlo <[email protected]>
+
FTL should enough things to compile inlined closure calls (like CheckExecutable and GetScope)
https://bugs.webkit.org/show_bug.cgi?id=126799
Modified: branches/jsCStack/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp (161733 => 161734)
--- branches/jsCStack/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2014-01-11 05:18:34 UTC (rev 161733)
+++ branches/jsCStack/Source/_javascript_Core/ftl/FTLLowerDFGToLLVM.cpp 2014-01-11 05:33:47 UTC (rev 161734)
@@ -1347,7 +1347,7 @@
BadExecutable, jsValueValue(cell), m_node->child1().node(),
m_out.notEqual(
m_out.loadPtr(cell, m_heaps.JSFunction_executable),
- weakPointer(m_node->function())));
+ weakPointer(m_node->executable())));
}
void compileArrayifyToStructure()
Modified: branches/jsCStack/Source/_javascript_Core/runtime/Options.cpp (161733 => 161734)
--- branches/jsCStack/Source/_javascript_Core/runtime/Options.cpp 2014-01-11 05:18:34 UTC (rev 161733)
+++ branches/jsCStack/Source/_javascript_Core/runtime/Options.cpp 2014-01-11 05:33:47 UTC (rev 161734)
@@ -201,11 +201,6 @@
|| Options::verboseFTLFailure())
Options::alwaysComputeHash() = true;
- // Do range checks where needed and make corrections to the options:
- ASSERT(Options::thresholdForOptimizeAfterLongWarmUp() >= Options::thresholdForOptimizeAfterWarmUp());
- ASSERT(Options::thresholdForOptimizeAfterWarmUp() >= Options::thresholdForOptimizeSoon());
- ASSERT(Options::thresholdForOptimizeAfterWarmUp() >= 0);
-
// Compute the maximum value of the reoptimization retry counter. This is simply
// the largest value at which we don't overflow the execute counter, when using it
// to left-shift the execution counter by this amount. Currently the value ends
@@ -249,6 +244,11 @@
#endif
recomputeDependentOptions();
+
+ // Do range checks where needed and make corrections to the options:
+ ASSERT(Options::thresholdForOptimizeAfterLongWarmUp() >= Options::thresholdForOptimizeAfterWarmUp());
+ ASSERT(Options::thresholdForOptimizeAfterWarmUp() >= Options::thresholdForOptimizeSoon());
+ ASSERT(Options::thresholdForOptimizeAfterWarmUp() >= 0);
}
// Parses a single command line option in the format "<optionName>=<value>"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
