<!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>[188675] 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/188675">188675</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-08-19 18:18:45 -0700 (Wed, 19 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>clearCode() should clear code
https://bugs.webkit.org/show_bug.cgi?id=148203
Reviewed by Saam Barati.
Clearing code used to require two steps: clearCode() and
clearUnlinkedCodeForRecompilation(). Unsurprisingly, clients sometimes
did one or the other or both without much rhyme or reason.
This patch simplifies things by merging both functions into clearCode().
* bytecode/UnlinkedFunctionExecutable.h:
* debugger/Debugger.cpp:
* heap/Heap.cpp:
(JSC::Heap::deleteAllCompiledCode):
(JSC::Heap::clearUnmarkedExecutables):
(JSC::Heap::deleteAllUnlinkedFunctionCode): Deleted. No need for this
function anymore since it was only used by clients who already called
clearCode() (and it would be terribly wrong to use without doing both.)
* heap/Heap.h:
(JSC::Heap::sizeAfterLastFullCollection):
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::TypeRecompiler::visit):
(Inspector::TypeRecompiler::operator()):
* runtime/Executable.cpp:
(JSC::FunctionExecutable::visitChildren):
(JSC::FunctionExecutable::clearCode):
(JSC::FunctionExecutable::clearUnlinkedCodeForRecompilation): Deleted.
* runtime/Executable.h:
* runtime/VM.cpp:
(JSC::VM::deleteAllCode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedFunctionExecutableh">trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h</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="#trunkSourceJavaScriptCoreheapHeaph">trunk/Source/JavaScriptCore/heap/Heap.h</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 (188674 => 188675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-20 00:59:22 UTC (rev 188674)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-20 01:18:45 UTC (rev 188675)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-08-19 Geoffrey Garen <ggaren@apple.com>
+
+ clearCode() should clear code
+ https://bugs.webkit.org/show_bug.cgi?id=148203
+
+ Reviewed by Saam Barati.
+
+ Clearing code used to require two steps: clearCode() and
+ clearUnlinkedCodeForRecompilation(). Unsurprisingly, clients sometimes
+ did one or the other or both without much rhyme or reason.
+
+ This patch simplifies things by merging both functions into clearCode().
+
+ * bytecode/UnlinkedFunctionExecutable.h:
+ * debugger/Debugger.cpp:
+ * heap/Heap.cpp:
+ (JSC::Heap::deleteAllCompiledCode):
+ (JSC::Heap::clearUnmarkedExecutables):
+ (JSC::Heap::deleteAllUnlinkedFunctionCode): Deleted. No need for this
+ function anymore since it was only used by clients who already called
+ clearCode() (and it would be terribly wrong to use without doing both.)
+
+ * heap/Heap.h:
+ (JSC::Heap::sizeAfterLastFullCollection):
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::TypeRecompiler::visit):
+ (Inspector::TypeRecompiler::operator()):
+ * runtime/Executable.cpp:
+ (JSC::FunctionExecutable::visitChildren):
+ (JSC::FunctionExecutable::clearCode):
+ (JSC::FunctionExecutable::clearUnlinkedCodeForRecompilation): Deleted.
+ * runtime/Executable.h:
+ * runtime/VM.cpp:
+ (JSC::VM::deleteAllCode):
+
</ins><span class="cx"> 2015-08-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> CMake Windows build should not include files directly from other Source directories
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedFunctionExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h (188674 => 188675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h 2015-08-20 00:59:22 UTC (rev 188674)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.h 2015-08-20 01:18:45 UTC (rev 188675)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> FunctionExecutable* link(VM&, const SourceCode&, int overrideLineNumber = -1);
</span><span class="cx">
</span><del>- void clearCodeForRecompilation()
</del><ins>+ void clearCode()
</ins><span class="cx"> {
</span><span class="cx"> m_codeBlockForCall.clear();
</span><span class="cx"> m_codeBlockForConstruct.clear();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (188674 => 188675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-08-20 00:59:22 UTC (rev 188674)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2015-08-20 01:18:45 UTC (rev 188675)
</span><span class="lines">@@ -88,7 +88,6 @@
</span><span class="cx">
</span><span class="cx"> ExecState* exec = function->scope()->globalObject()->JSGlobalObject::globalExec();
</span><span class="cx"> executable->clearCode();
</span><del>- executable->clearUnlinkedCodeForRecompilation();
</del><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 (188674 => 188675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-08-20 00:59:22 UTC (rev 188674)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-08-20 01:18:45 UTC (rev 188675)
</span><span class="lines">@@ -936,15 +936,6 @@
</span><span class="cx"> m_codeBlocks.deleteUnmarkedAndUnreferenced(FullCollection);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::deleteAllUnlinkedFunctionCode()
-{
- for (ExecutableBase* current : m_compiledCode) {
- if (!current->isFunctionExecutable())
- continue;
- static_cast<FunctionExecutable*>(current)->clearUnlinkedCodeForRecompilation();
- }
-}
-
</del><span class="cx"> void Heap::clearUnmarkedExecutables()
</span><span class="cx"> {
</span><span class="cx"> GCPHASE(ClearUnmarkedExecutables);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (188674 => 188675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2015-08-20 00:59:22 UTC (rev 188674)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2015-08-20 01:18:45 UTC (rev 188675)
</span><span class="lines">@@ -209,7 +209,6 @@
</span><span class="cx"> size_t sizeAfterLastFullCollection() const { return m_sizeAfterLastFullCollect; }
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void deleteAllCompiledCode();
</span><del>- void deleteAllUnlinkedFunctionCode();
</del><span class="cx">
</span><span class="cx"> void didAllocate(size_t);
</span><span class="cx"> void didAbandon(size_t);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (188674 => 188675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-08-20 00:59:22 UTC (rev 188674)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2015-08-20 01:18:45 UTC (rev 188675)
</span><span class="lines">@@ -316,7 +316,6 @@
</span><span class="cx">
</span><span class="cx"> FunctionExecutable* executable = jsCast<FunctionExecutable*>(cell);
</span><span class="cx"> executable->clearCode();
</span><del>- executable->clearUnlinkedCodeForRecompilation();
</del><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 (188674 => 188675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.cpp 2015-08-20 00:59:22 UTC (rev 188674)
+++ trunk/Source/JavaScriptCore/runtime/Executable.cpp 2015-08-20 01:18:45 UTC (rev 188675)
</span><span class="lines">@@ -557,13 +557,9 @@
</span><span class="cx"> visitor.append(&thisObject->m_singletonFunction);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FunctionExecutable::clearUnlinkedCodeForRecompilation()
-{
- m_unlinkedExecutable->clearCodeForRecompilation();
-}
-
</del><span class="cx"> void FunctionExecutable::clearCode()
</span><span class="cx"> {
</span><ins>+ m_unlinkedExecutable->clearCode();
</ins><span class="cx"> m_codeBlockForCall = nullptr;
</span><span class="cx"> m_codeBlockForConstruct = nullptr;
</span><span class="cx"> Base::clearCode();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.h (188674 => 188675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.h 2015-08-20 00:59:22 UTC (rev 188674)
+++ trunk/Source/JavaScriptCore/runtime/Executable.h 2015-08-20 01:18:45 UTC (rev 188675)
</span><span class="lines">@@ -640,7 +640,6 @@
</span><span class="cx"> JSString* nameValue() const { return m_unlinkedExecutable->nameValue(); }
</span><span class="cx"> size_t parameterCount() const { return m_unlinkedExecutable->parameterCount(); } // Excluding 'this'!
</span><span class="cx">
</span><del>- void clearUnlinkedCodeForRecompilation();
</del><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></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (188674 => 188675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2015-08-20 00:59:22 UTC (rev 188674)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2015-08-20 01:18:45 UTC (rev 188675)
</span><span class="lines">@@ -485,7 +485,6 @@
</span><span class="cx"> m_codeCache->clear();
</span><span class="cx"> m_regExpCache->deleteAllCode();
</span><span class="cx"> heap.deleteAllCompiledCode();
</span><del>- heap.deleteAllUnlinkedFunctionCode();
</del><span class="cx"> heap.reportAbandonedObjectGraph();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>