<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168932] branches/safari-538.34.5-branch/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168932">168932</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-16 00:08:52 -0700 (Fri, 16 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/168497">r168497</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari538345branchSourceJavaScriptCoreChangeLog">branches/safari-538.34.5-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari538345branchSourceJavaScriptCorebytecodeCodeBlockcpp">branches/safari-538.34.5-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#branchessafari538345branchSourceJavaScriptCoredfgDFGPlancpp">branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>
<li><a href="#branchessafari538345branchSourceJavaScriptCoreheapHeapcpp">branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#branchessafari538345branchSourceWebKit2WebProcesscocoaWebProcessCocoamm">branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari538345branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/ChangeLog (168931 => 168932)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/ChangeLog 2014-05-16 07:06:34 UTC (rev 168931)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/ChangeLog 2014-05-16 07:08:52 UTC (rev 168932)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-16 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168497
+
+ 2014-05-08 Filip Pizlo <fpizlo@apple.com>
+
+ deleteAllCompiledCode() shouldn't use the suspension worklist
+ https://bugs.webkit.org/show_bug.cgi?id=132708
+
+ Reviewed by Mark Hahnenberg.
+
+ * bytecode/CodeBlock.cpp:
+ (JSC::CodeBlock::setOptimizationThresholdBasedOnCompilationResult):
+ * dfg/DFGPlan.cpp:
+ (JSC::DFG::Plan::isStillValid):
+ * heap/Heap.cpp:
+ (JSC::Heap::deleteAllCompiledCode):
+
</ins><span class="cx"> 2014-05-15 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168459
</span></span></pre></div>
<a id="branchessafari538345branchSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp (168931 => 168932)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-05-16 07:06:34 UTC (rev 168931)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2014-05-16 07:08:52 UTC (rev 168932)
</span><span class="lines">@@ -3112,8 +3112,22 @@
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> void CodeBlock::setOptimizationThresholdBasedOnCompilationResult(CompilationResult result)
</span><span class="cx"> {
</span><del>- RELEASE_ASSERT(jitType() == JITCode::BaselineJIT);
- RELEASE_ASSERT((result == CompilationSuccessful) == (replacement() != this));
</del><ins>+ JITCode::JITType type = jitType();
+ if (type != JITCode::BaselineJIT) {
+ dataLog(*this, ": expected to have baseline code but have ", type, "\n");
+ RELEASE_ASSERT_NOT_REACHED();
+ }
+
+ CodeBlock* theReplacement = replacement();
+ if ((result == CompilationSuccessful) != (theReplacement != this)) {
+ dataLog(*this, ": we have result = ", result, " but ");
+ if (theReplacement == this)
+ dataLog("we are our own replacement.\n");
+ else
+ dataLog("our replacement is ", pointerDump(theReplacement), "\n");
+ RELEASE_ASSERT_NOT_REACHED();
+ }
+
</ins><span class="cx"> switch (result) {
</span><span class="cx"> case CompilationSuccessful:
</span><span class="cx"> RELEASE_ASSERT(JITCode::isOptimizingJIT(replacement()->jitType()));
</span><span class="lines">@@ -3136,6 +3150,8 @@
</span><span class="cx"> optimizeAfterWarmUp();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ dataLog("Unrecognized result: ", static_cast<int>(result), "\n");
</ins><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari538345branchSourceJavaScriptCoredfgDFGPlancpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp (168931 => 168932)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp 2014-05-16 07:06:34 UTC (rev 168931)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGPlan.cpp 2014-05-16 07:08:52 UTC (rev 168932)
</span><span class="lines">@@ -386,6 +386,10 @@
</span><span class="cx"> CodeBlock* replacement = codeBlock->replacement();
</span><span class="cx"> if (!replacement)
</span><span class="cx"> return false;
</span><ins>+ // FIXME: This is almost certainly not necessary. There's no way for the baseline
+ // code to be replaced during a compilation, except if we delete the plan, in which
+ // case we wouldn't be here.
+ // https://bugs.webkit.org/show_bug.cgi?id=132707
</ins><span class="cx"> if (codeBlock->alternative() != replacement->baselineVersion())
</span><span class="cx"> return false;
</span><span class="cx"> if (!watchpoints.areStillValid())
</span></span></pre></div>
<a id="branchessafari538345branchSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/Heap.cpp (168931 => 168932)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/Heap.cpp 2014-05-16 07:06:34 UTC (rev 168931)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/Heap.cpp 2014-05-16 07:08:52 UTC (rev 168932)
</span><span class="lines">@@ -886,9 +886,11 @@
</span><span class="cx"> // means that we are running some hot JS code right now. Maybe causing
</span><span class="cx"> // recompilations isn't a good idea.
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><del>- for (auto worklist : m_suspendedCompilerWorklists) {
- if (worklist->isActiveForVM(*vm()))
- return;
</del><ins>+ for (unsigned i = DFG::numberOfWorklists(); i--;) {
+ if (DFG::Worklist* worklist = DFG::worklistForIndexOrNull(i)) {
+ if (worklist->isActiveForVM(*vm()))
+ return;
+ }
</ins><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari538345branchSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (168931 => 168932)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-05-16 07:06:34 UTC (rev 168931)
+++ branches/safari-538.34.5-branch/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-05-16 07:08:52 UTC (rev 168932)
</span><span class="lines">@@ -192,13 +192,6 @@
</span><span class="cx"> m_shouldForceScreenFontSubstitution = parameters.shouldForceScreenFontSubstitution;
</span><span class="cx"> Font::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0);
</span><span class="cx">
</span><del>- if (!JSC::Options::useJITWasOverridden())
- JSC::Options::useJIT() = parameters.shouldEnableJIT;
-#if ENABLE(FTL_JIT)
- if (!JSC::Options::useFTLJITWasOverridden())
- JSC::Options::useFTLJIT() = parameters.shouldEnableFTLJIT;
-#endif
-
</del><span class="cx"> setEnhancedAccessibility(parameters.accessibilityEnhancedUserInterfaceEnabled);
</span><span class="cx">
</span><span class="cx"> #if USE(APPKIT)
</span></span></pre>
</div>
</div>
</body>
</html>