<!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>[185379] 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/185379">185379</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-06-09 14:20:08 -0700 (Tue, 09 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>FunctionExecutable::isCompiling() is weird and wrong.
<https://webkit.org/b/145689>
Reviewed by Geoffrey Garen.
Remove FunctionExecutable::isCompiling() and the clearCodeIfNotCompiling() style
functions that called it before throwing away code.
isCompiling() would consider the executable to be "compiling" if it had a CodeBlock
but no JITCode. In practice, every executable gets a JITCode at the same time as it
gets a CodeBlock, by way of prepareForExecutionImpl().
* debugger/Debugger.cpp:
* heap/Heap.cpp:
(JSC::Heap::deleteAllCompiledCode):
(JSC::Heap::deleteAllUnlinkedFunctionCode):
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::TypeRecompiler::visit):
* runtime/Executable.cpp:
(JSC::FunctionExecutable::clearUnlinkedCodeForRecompilation):
(JSC::FunctionExecutable::clearCodeIfNotCompiling): Deleted.
(JSC::FunctionExecutable::clearUnlinkedCodeForRecompilationIfNotCompiling): Deleted.
* runtime/Executable.h:
* runtime/VM.cpp:
(JSC::StackPreservingRecompiler::visit):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggercpp">trunk/Source/JavaScriptCore/debugger/Debugger.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutablecpp">trunk/Source/JavaScriptCore/runtime/Executable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutableh">trunk/Source/JavaScriptCore/runtime/Executable.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (185378 => 185379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-06-09 21:19:19 UTC (rev 185378)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-06-09 21:20:08 UTC (rev 185379)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-06-09 Andreas Kling <akling@apple.com>
+
+ FunctionExecutable::isCompiling() is weird and wrong.
+ <https://webkit.org/b/145689>
+
+ Reviewed by Geoffrey Garen.
+
+ Remove FunctionExecutable::isCompiling() and the clearCodeIfNotCompiling() style
+ functions that called it before throwing away code.
+
+ isCompiling() would consider the executable to be "compiling" if it had a CodeBlock
+ but no JITCode. In practice, every executable gets a JITCode at the same time as it
+ gets a CodeBlock, by way of prepareForExecutionImpl().
+
+ * debugger/Debugger.cpp:
+ * heap/Heap.cpp:
+ (JSC::Heap::deleteAllCompiledCode):
+ (JSC::Heap::deleteAllUnlinkedFunctionCode):
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::TypeRecompiler::visit):
+ * runtime/Executable.cpp:
+ (JSC::FunctionExecutable::clearUnlinkedCodeForRecompilation):
+ (JSC::FunctionExecutable::clearCodeIfNotCompiling): Deleted.
+ (JSC::FunctionExecutable::clearUnlinkedCodeForRecompilationIfNotCompiling): Deleted.
+ * runtime/Executable.h:
+ * runtime/VM.cpp:
+ (JSC::StackPreservingRecompiler::visit):
+
</ins><span class="cx"> 2015-06-09 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Introduce getter definition into static hash tables and use it for getters in RegExp.prototype.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (185378 => 185379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-06-09 21:19:19 UTC (rev 185378)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-06-09 21:20:08 UTC (rev 185379)
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ExecState* exec = function->scope()->globalObject()->JSGlobalObject::globalExec();
</span><del>- executable->clearCodeIfNotCompiling();
- executable->clearUnlinkedCodeForRecompilationIfNotCompiling();
</del><ins>+ executable->clearCode();
+ executable->clearUnlinkedCodeForRecompilation();
</ins><span class="cx"> if (m_debugger == function->scope()->globalObject()->debugger())
</span><span class="cx"> m_sourceProviders.add(executable->source().provider(), exec);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (185378 => 185379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-06-09 21:19:19 UTC (rev 185378)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-06-09 21:20:08 UTC (rev 185379)
</span><span class="lines">@@ -926,7 +926,7 @@
</span><span class="cx"> for (ExecutableBase* current : m_compiledCode) {
</span><span class="cx"> if (!current->isFunctionExecutable())
</span><span class="cx"> continue;
</span><del>- static_cast<FunctionExecutable*>(current)->clearCodeIfNotCompiling();
</del><ins>+ static_cast<FunctionExecutable*>(current)->clearCode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ASSERT(m_operationInProgress == FullCollection || m_operationInProgress == NoOperation);
</span><span class="lines">@@ -939,7 +939,7 @@
</span><span class="cx"> for (ExecutableBase* current : m_compiledCode) {
</span><span class="cx"> if (!current->isFunctionExecutable())
</span><span class="cx"> continue;
</span><del>- static_cast<FunctionExecutable*>(current)->clearUnlinkedCodeForRecompilationIfNotCompiling();
</del><ins>+ static_cast<FunctionExecutable*>(current)->clearUnlinkedCodeForRecompilation();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (185378 => 185379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-06-09 21:19:19 UTC (rev 185378)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-06-09 21:20:08 UTC (rev 185379)
</span><span class="lines">@@ -315,8 +315,8 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> FunctionExecutable* executable = jsCast<FunctionExecutable*>(cell);
</span><del>- executable->clearCodeIfNotCompiling();
- executable->clearUnlinkedCodeForRecompilationIfNotCompiling();
</del><ins>+ executable->clearCode();
+ executable->clearUnlinkedCodeForRecompilation();
</ins><span class="cx"> }
</span><span class="cx"> inline IterationStatus operator()(JSCell* cell)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.cpp (185378 => 185379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.cpp 2015-06-09 21:19:19 UTC (rev 185378)
+++ trunk/Source/JavaScriptCore/runtime/Executable.cpp 2015-06-09 21:20:08 UTC (rev 185379)
</span><span class="lines">@@ -580,17 +580,8 @@
</span><span class="cx"> return codeBlockFor(kind)->symbolTable();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FunctionExecutable::clearCodeIfNotCompiling()
</del><ins>+void FunctionExecutable::clearUnlinkedCodeForRecompilation()
</ins><span class="cx"> {
</span><del>- if (isCompiling())
- return;
- clearCode();
-}
-
-void FunctionExecutable::clearUnlinkedCodeForRecompilationIfNotCompiling()
-{
- if (isCompiling())
- return;
</del><span class="cx"> m_unlinkedExecutable->clearCodeForRecompilation();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.h (185378 => 185379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.h 2015-06-09 21:19:19 UTC (rev 185378)
+++ trunk/Source/JavaScriptCore/runtime/Executable.h 2015-06-09 21:20:08 UTC (rev 185379)
</span><span class="lines">@@ -637,8 +637,7 @@
</span><span class="cx"> size_t parameterCount() const { return m_unlinkedExecutable->parameterCount(); } // Excluding 'this'!
</span><span class="cx"> SymbolTable* symbolTable(CodeSpecializationKind);
</span><span class="cx">
</span><del>- void clearCodeIfNotCompiling();
- void clearUnlinkedCodeForRecompilationIfNotCompiling();
</del><ins>+ void clearUnlinkedCodeForRecompilation();
</ins><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx"> static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto)
</span><span class="cx"> {
</span><span class="lines">@@ -669,17 +668,6 @@
</span><span class="cx">
</span><span class="cx"> void finishCreation(VM&);
</span><span class="cx">
</span><del>- bool isCompiling()
- {
-#if ENABLE(JIT)
- if (!m_jitCodeForCall && m_codeBlockForCall)
- return true;
- if (!m_jitCodeForConstruct && m_codeBlockForConstruct)
- return true;
-#endif
- return false;
- }
-
</del><span class="cx"> friend class ScriptExecutable;
</span><span class="cx">
</span><span class="cx"> WriteBarrier<UnlinkedFunctionExecutable> m_unlinkedExecutable;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (185378 => 185379)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2015-06-09 21:19:19 UTC (rev 185378)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2015-06-09 21:20:08 UTC (rev 185379)
</span><span class="lines">@@ -504,7 +504,7 @@
</span><span class="cx"> FunctionExecutable* executable = jsCast<FunctionExecutable*>(cell);
</span><span class="cx"> if (currentlyExecutingFunctions.contains(executable))
</span><span class="cx"> return;
</span><del>- executable->clearCodeIfNotCompiling();
</del><ins>+ executable->clearCode();
</ins><span class="cx"> }
</span><span class="cx"> IterationStatus operator()(JSCell* cell)
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>