Title: [195576] trunk/Source/_javascript_Core
- Revision
- 195576
- Author
- [email protected]
- Date
- 2016-01-25 19:12:29 -0800 (Mon, 25 Jan 2016)
Log Message
Unreviewed, rolling out r195550.
https://bugs.webkit.org/show_bug.cgi?id=153471
broke animometer bot (and now we have crash logs!) (Requested
by kling on #webkit).
Reverted changeset:
"Restore CodeBlock jettison code Geoff accidentally removed"
https://bugs.webkit.org/show_bug.cgi?id=151241
http://trac.webkit.org/changeset/195550
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (195575 => 195576)
--- trunk/Source/_javascript_Core/ChangeLog 2016-01-26 02:57:51 UTC (rev 195575)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-01-26 03:12:29 UTC (rev 195576)
@@ -1,3 +1,17 @@
+2016-01-25 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r195550.
+ https://bugs.webkit.org/show_bug.cgi?id=153471
+
+ broke animometer bot (and now we have crash logs!) (Requested
+ by kling on #webkit).
+
+ Reverted changeset:
+
+ "Restore CodeBlock jettison code Geoff accidentally removed"
+ https://bugs.webkit.org/show_bug.cgi?id=151241
+ http://trac.webkit.org/changeset/195550
+
2016-01-25 Andreas Kling <[email protected]>
MarkedSpace should have more precise allocators.
Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (195575 => 195576)
--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2016-01-26 02:57:51 UTC (rev 195575)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp 2016-01-26 03:12:29 UTC (rev 195576)
@@ -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)
@@ -2552,13 +2530,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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
