<!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>[208777] trunk/Source/JavaScriptCore</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/208777">208777</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-11-15 17:35:09 -0800 (Tue, 15 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, revert renaming useConcurrentJIT to useConcurrentJS.
* dfg/DFGDriver.cpp:
(JSC::DFG::compileImpl):
* heap/Heap.cpp:
(JSC::Heap::addToRememberedSet):
* jit/JITWorklist.cpp:
(JSC::JITWorklist::compileLater):
(JSC::JITWorklist::compileNow):
* runtime/Options.cpp:
(JSC::recomputeDependentOptions):
* runtime/Options.h:
* runtime/WriteBarrierInlines.h:
(JSC::WriteBarrierBase<T>::set):
(JSC::WriteBarrierBase<Unknown>::set):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGDrivercpp">trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITWorklistcpp">trunk/Source/JavaScriptCore/jit/JITWorklist.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionscpp">trunk/Source/JavaScriptCore/runtime/Options.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeWriteBarrierInlinesh">trunk/Source/JavaScriptCore/runtime/WriteBarrierInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208776 => 208777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-16 01:35:09 UTC (rev 208777)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-11-15 Filip Pizlo <fpizlo@apple.com>
+
+ Unreviewed, revert renaming useConcurrentJIT to useConcurrentJS.
+
+ * dfg/DFGDriver.cpp:
+ (JSC::DFG::compileImpl):
+ * heap/Heap.cpp:
+ (JSC::Heap::addToRememberedSet):
+ * jit/JITWorklist.cpp:
+ (JSC::JITWorklist::compileLater):
+ (JSC::JITWorklist::compileNow):
+ * runtime/Options.cpp:
+ (JSC::recomputeDependentOptions):
+ * runtime/Options.h:
+ * runtime/WriteBarrierInlines.h:
+ (JSC::WriteBarrierBase<T>::set):
+ (JSC::WriteBarrierBase<Unknown>::set):
+
</ins><span class="cx"> 2016-11-15 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Debugging and other tools should not disable the code cache
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGDrivercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp (208776 => 208777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp 2016-11-16 01:35:09 UTC (rev 208777)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> new Plan(codeBlock, profiledDFGCodeBlock, mode, osrEntryBytecodeIndex, mustHandleValues));
</span><span class="cx">
</span><span class="cx"> plan->callback = callback;
</span><del>- if (Options::useConcurrentJS()) {
</del><ins>+ if (Options::useConcurrentJIT()) {
</ins><span class="cx"> Worklist& worklist = ensureGlobalWorklistFor(mode);
</span><span class="cx"> if (logCompilationChanges(mode))
</span><span class="cx"> dataLog("Deferring DFG compilation of ", *codeBlock, " with queue length ", worklist.queueLength(), ".\n");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (208776 => 208777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-11-16 01:35:09 UTC (rev 208777)
</span><span class="lines">@@ -985,7 +985,7 @@
</span><span class="cx"> void Heap::addToRememberedSet(const JSCell* cell)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(cell);
</span><del>- ASSERT(!Options::useConcurrentJS() || !isCompilationThread());
</del><ins>+ ASSERT(!Options::useConcurrentJIT() || !isCompilationThread());
</ins><span class="cx"> if (!Heap::isMarkedConcurrently(cell)) {
</span><span class="cx"> // During a full collection a store into an unmarked object that had surivived past
</span><span class="cx"> // collections will manifest as a store to an unmarked black object. If the object gets
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITWorklistcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITWorklist.cpp (208776 => 208777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITWorklist.cpp 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/JavaScriptCore/jit/JITWorklist.cpp 2016-11-16 01:35:09 UTC (rev 208777)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!Options::useConcurrentJS()) {
</del><ins>+ if (!Options::useConcurrentJIT()) {
</ins><span class="cx"> Plan::compileNow(codeBlock);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isPlanned) {
</span><del>- RELEASE_ASSERT(Options::useConcurrentJS());
</del><ins>+ RELEASE_ASSERT(Options::useConcurrentJIT());
</ins><span class="cx"> // This is expensive, but probably good enough.
</span><span class="cx"> completeAllForVM(*codeBlock->vm());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.cpp (208776 => 208777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.cpp 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/JavaScriptCore/runtime/Options.cpp 2016-11-16 01:35:09 UTC (rev 208777)
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx"> Options::useRegExpJIT() = false;
</span><span class="cx"> #endif
</span><span class="cx"> #if !ENABLE(CONCURRENT_JS)
</span><del>- Options::useConcurrentJS() = false;
</del><ins>+ Options::useConcurrentJIT() = false;
</ins><span class="cx"> #endif
</span><span class="cx"> #if !ENABLE(DFG_JIT)
</span><span class="cx"> Options::useDFGJIT() = false;
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> Options::thresholdForFTLOptimizeAfterWarmUp() = 20;
</span><span class="cx"> Options::thresholdForFTLOptimizeSoon() = 20;
</span><span class="cx"> Options::maximumEvalCacheableSourceLength() = 150000;
</span><del>- Options::useConcurrentJS() = false;
</del><ins>+ Options::useConcurrentJIT() = false;
</ins><span class="cx"> }
</span><span class="cx"> if (Options::useMaximalFlushInsertionPhase()) {
</span><span class="cx"> Options::useOSREntryToDFG() = false;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (208776 => 208777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2016-11-16 01:35:09 UTC (rev 208777)
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> v(bool, useObjectAllocationSinking, true, Normal, nullptr) \
</span><span class="cx"> v(bool, logExecutableAllocation, false, Normal, nullptr) \
</span><span class="cx"> \
</span><del>- v(bool, useConcurrentJS, true, Normal, "allows the DFG / FTL compilation in threads other than the executing JS thread") \
</del><ins>+ v(bool, useConcurrentJIT, true, Normal, "allows the DFG / FTL compilation in threads other than the executing JS thread") \
</ins><span class="cx"> v(unsigned, numberOfDFGCompilerThreads, computeNumberOfWorkerThreads(2, 2) - 1, Normal, nullptr) \
</span><span class="cx"> v(unsigned, numberOfFTLCompilerThreads, computeNumberOfWorkerThreads(8, 2) - 1, Normal, nullptr) \
</span><span class="cx"> v(int32, priorityDeltaOfDFGCompilerThreads, computePriorityDeltaOfWorkerThreads(-1, 0), Normal, nullptr) \
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx"> v(enablePolymorphicCallInlining, usePolymorphicCallInlining, SameOption) \
</span><span class="cx"> v(enableMovHintRemoval, useMovHintRemoval, SameOption) \
</span><span class="cx"> v(enableObjectAllocationSinking, useObjectAllocationSinking, SameOption) \
</span><del>- v(enableConcurrentJS, useConcurrentJS, SameOption) \
</del><ins>+ v(enableConcurrentJIT, useConcurrentJIT, SameOption) \
</ins><span class="cx"> v(enableProfiler, useProfiler, SameOption) \
</span><span class="cx"> v(enableArchitectureSpecificOptimizations, useArchitectureSpecificOptimizations, SameOption) \
</span><span class="cx"> v(enablePolyvariantCallInlining, usePolyvariantCallInlining, SameOption) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeWriteBarrierInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/WriteBarrierInlines.h (208776 => 208777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/WriteBarrierInlines.h 2016-11-16 01:16:31 UTC (rev 208776)
+++ trunk/Source/JavaScriptCore/runtime/WriteBarrierInlines.h 2016-11-16 01:35:09 UTC (rev 208777)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> inline void WriteBarrierBase<T>::set(VM& vm, const JSCell* owner, T* value)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- ASSERT(!Options::useConcurrentJS() || !isCompilationThread());
</del><ins>+ ASSERT(!Options::useConcurrentJIT() || !isCompilationThread());
</ins><span class="cx"> validateCell(value);
</span><span class="cx"> setEarlyValue(vm, owner, value);
</span><span class="cx"> }
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> inline void WriteBarrierBase<Unknown>::set(VM& vm, const JSCell* owner, JSValue value)
</span><span class="cx"> {
</span><del>- ASSERT(!Options::useConcurrentJS() || !isCompilationThread());
</del><ins>+ ASSERT(!Options::useConcurrentJIT() || !isCompilationThread());
</ins><span class="cx"> m_value = JSValue::encode(value);
</span><span class="cx"> vm.heap.writeBarrier(owner, value);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>