Title: [192450] trunk/Source/_javascript_Core
- Revision
- 192450
- Author
- commit-qu...@webkit.org
- Date
- 2015-11-13 16:40:54 -0800 (Fri, 13 Nov 2015)
Log Message
Unreviewed, rolling out r192401.
https://bugs.webkit.org/show_bug.cgi?id=151282
"caused crashes on animometer" (Requested by thorton on
#webkit).
Reverted changeset:
"Restore CodeBlock jettison code I accidentally removed"
https://bugs.webkit.org/show_bug.cgi?id=151241
http://trac.webkit.org/changeset/192401
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (192449 => 192450)
--- trunk/Source/_javascript_Core/ChangeLog 2015-11-14 00:30:58 UTC (rev 192449)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-11-14 00:40:54 UTC (rev 192450)
@@ -1,3 +1,17 @@
+2015-11-13 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r192401.
+ https://bugs.webkit.org/show_bug.cgi?id=151282
+
+ "caused crashes on animometer" (Requested by thorton on
+ #webkit).
+
+ Reverted changeset:
+
+ "Restore CodeBlock jettison code I accidentally removed"
+ https://bugs.webkit.org/show_bug.cgi?id=151241
+ http://trac.webkit.org/changeset/192401
+
2015-11-13 Andreas Kling <akl...@apple.com>
Follow-up for 32-bit test failures after...
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (192449 => 192450)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2015-11-14 00:30:58 UTC (rev 192449)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2015-11-14 00:40:54 UTC (rev 192450)
@@ -81,28 +81,6 @@
namespace JSC {
-static std::chrono::milliseconds timeToLive(JITCode::JITType jitType)
-{
- switch (jitType) {
- case JITCode::InterpreterThunk:
- return std::chrono::duration_cast<std::chrono::milliseconds>(
- std::chrono::seconds(5));
- case JITCode::BaselineJIT:
- // Effectively 10 additional seconds, since BaselineJIT and
- // InterpreterThunk share a CodeBlock.
- return std::chrono::duration_cast<std::chrono::milliseconds>(
- std::chrono::seconds(15));
- case JITCode::DFGJIT:
- return std::chrono::duration_cast<std::chrono::milliseconds>(
- std::chrono::seconds(20));
- case JITCode::FTLJIT:
- return std::chrono::duration_cast<std::chrono::milliseconds>(
- std::chrono::seconds(60));
- default:
- return std::chrono::milliseconds::max();
- }
-}
-
const ClassInfo CodeBlock::s_info = {
"CodeBlock", 0, 0,
CREATE_METHOD_TABLE(CodeBlock)
@@ -2439,13 +2417,7 @@
bool CodeBlock::shouldJettisonDueToOldAge()
{
- if (Heap::isMarked(this))
- return false;
-
- if (timeSinceCreation() < timeToLive(jitType()))
- return false;
-
- return true;
+ return false;
}
#if ENABLE(DFG_JIT)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
