Changeset 195576 in webkit


Ignore:
Timestamp:
Jan 25, 2016 7:12:29 PM (8 years ago)
Author:
commit-queue@webkit.org
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

Location:
trunk/Source/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r195575 r195576  
     12016-01-25  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r195550.
     4        https://bugs.webkit.org/show_bug.cgi?id=153471
     5
     6        broke animometer bot (and now we have crash logs!) (Requested
     7        by kling on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Restore CodeBlock jettison code Geoff accidentally removed"
     12        https://bugs.webkit.org/show_bug.cgi?id=151241
     13        http://trac.webkit.org/changeset/195550
     14
    1152016-01-25  Andreas Kling  <akling@apple.com>
    216

  • trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp

    r195550 r195576  
    8181
    8282namespace JSC {
    83 
    84 static std::chrono::milliseconds timeToLive(JITCode::JITType jitType)
    85 {
    86     switch (jitType) {
    87     case JITCode::InterpreterThunk:
    88         return std::chrono::duration_cast<std::chrono::milliseconds>(
    89             std::chrono::seconds(5));
    90     case JITCode::BaselineJIT:
    91         // Effectively 10 additional seconds, since BaselineJIT and
    92         // InterpreterThunk share a CodeBlock.
    93         return std::chrono::duration_cast<std::chrono::milliseconds>(
    94             std::chrono::seconds(15));
    95     case JITCode::DFGJIT:
    96         return std::chrono::duration_cast<std::chrono::milliseconds>(
    97             std::chrono::seconds(20));
    98     case JITCode::FTLJIT:
    99         return std::chrono::duration_cast<std::chrono::milliseconds>(
    100             std::chrono::seconds(60));
    101     default:
    102         return std::chrono::milliseconds::max();
    103     }
    104 }
    10583
    10684const ClassInfo CodeBlock::s_info = {
    … …  
    25532531bool CodeBlock::shouldJettisonDueToOldAge()
    25542532{
    2555     if (Heap::isMarked(this))
    2556         return false;
    2557 
    2558     if (timeSinceCreation() < timeToLive(jitType()))
    2559         return false;
    2560 
    2561     return true;
     2533    return false;
    25622534}
    25632535
Note: See TracChangeset for help on using the changeset viewer.