Unreviewed, rolling out r192401.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Nov 2015 00:40:54 +0000 (00:40 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Nov 2015 00:40:54 +0000 (00:40 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/bytecode/CodeBlock.cpp

index 66bb789..48c69e0 100644 (file)
@@ -1,3 +1,17 @@
+2015-11-13  Commit Queue  <commit-queue@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  <akling@apple.com>
 
         Follow-up for 32-bit test failures after...
index 192cbc7..18ffa07 100644 (file)
 
 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::shouldJettisonDueToWeakReference()
 
 bool CodeBlock::shouldJettisonDueToOldAge()
 {
-    if (Heap::isMarked(this))
-        return false;
-
-    if (timeSinceCreation() < timeToLive(jitType()))
-        return false;
-
-    return true;
+    return false;
 }
 
 #if ENABLE(DFG_JIT)