<!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>[173304] 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/173304">173304</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-09-04 18:54:02 -0700 (Thu, 04 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure that deleting all code first processes the call edge log, and reenable call edge profiling.
Rubber stamped by Sam Weinig.
* debugger/Debugger.cpp:
(JSC::Debugger::forEachCodeBlock):
(JSC::Debugger::setSteppingMode):
(JSC::Debugger::recompileAllJSFunctions):
* inspector/agents/InspectorRuntimeAgent.cpp:
(Inspector::recompileAllJSFunctionsForTypeProfiling):
* runtime/Options.h: Reenable call edge profiling.
* runtime/VM.cpp:
(JSC::VM::prepareToDiscardCode): Make sure this also processes the call edge log, in case any call edge profiles are about to be destroyed.
(JSC::VM::discardAllCode):
(JSC::VM::releaseExecutableMemory):
(JSC::VM::setEnabledProfiler):
(JSC::VM::waitForCompilationsToComplete): Deleted.
* runtime/VM.h: Rename waitForCompilationsToComplete() back to prepareToDiscardCode() because the purpose of the method - now as ever - is to do all of the things that need to be done to ensure that code may be safely deleted.</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="#trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173303 => 173304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-05 01:52:53 UTC (rev 173303)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-05 01:54:02 UTC (rev 173304)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-09-04 Filip Pizlo <fpizlo@apple.com>
+
+ Make sure that deleting all code first processes the call edge log, and reenable call edge profiling.
+
+ Rubber stamped by Sam Weinig.
+
+ * debugger/Debugger.cpp:
+ (JSC::Debugger::forEachCodeBlock):
+ (JSC::Debugger::setSteppingMode):
+ (JSC::Debugger::recompileAllJSFunctions):
+ * inspector/agents/InspectorRuntimeAgent.cpp:
+ (Inspector::recompileAllJSFunctionsForTypeProfiling):
+ * runtime/Options.h: Reenable call edge profiling.
+ * runtime/VM.cpp:
+ (JSC::VM::prepareToDiscardCode): Make sure this also processes the call edge log, in case any call edge profiles are about to be destroyed.
+ (JSC::VM::discardAllCode):
+ (JSC::VM::releaseExecutableMemory):
+ (JSC::VM::setEnabledProfiler):
+ (JSC::VM::waitForCompilationsToComplete): Deleted.
+ * runtime/VM.h: Rename waitForCompilationsToComplete() back to prepareToDiscardCode() because the purpose of the method - now as ever - is to do all of the things that need to be done to ensure that code may be safely deleted.
+
</ins><span class="cx"> 2014-09-04 Akos Kiss <akiss@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Ensure that the call frame set up by vmEntryToNative does not overlap with the stack of the callee
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/Debugger.cpp (173303 => 173304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2014-09-05 01:52:53 UTC (rev 173303)
+++ trunk/Source/JavaScriptCore/debugger/Debugger.cpp 2014-09-05 01:54:02 UTC (rev 173304)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> template<typename Functor>
</span><span class="cx"> void Debugger::forEachCodeBlock(Functor& functor)
</span><span class="cx"> {
</span><del>- m_vm->waitForCompilationsToComplete();
</del><ins>+ m_vm->prepareToDiscardCode();
</ins><span class="cx"> m_vm->heap.forEachCodeBlock(functor);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> if (mode == m_steppingMode || !m_vm)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_vm->waitForCompilationsToComplete();
</del><ins>+ m_vm->prepareToDiscardCode();
</ins><span class="cx">
</span><span class="cx"> m_steppingMode = mode;
</span><span class="cx"> SetSteppingModeFunctor functor(this, mode);
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- vm->waitForCompilationsToComplete();
</del><ins>+ vm->prepareToDiscardCode();
</ins><span class="cx">
</span><span class="cx"> Recompiler recompiler(this);
</span><span class="cx"> HeapIterationScope iterationScope(vm->heap);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorRuntimeAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp (173303 => 173304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-09-05 01:52:53 UTC (rev 173303)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.cpp 2014-09-05 01:54:02 UTC (rev 173304)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx">
</span><span class="cx"> static void recompileAllJSFunctionsForTypeProfiling(VM& vm, bool shouldEnableTypeProfiling)
</span><span class="cx"> {
</span><del>- vm.waitForCompilationsToComplete();
</del><ins>+ vm.prepareToDiscardCode();
</ins><span class="cx">
</span><span class="cx"> bool needsToRecompile = (shouldEnableTypeProfiling ? vm.enableTypeProfiler() : vm.disableTypeProfiler());
</span><span class="cx"> if (needsToRecompile) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (173303 => 173304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2014-09-05 01:52:53 UTC (rev 173303)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2014-09-05 01:54:02 UTC (rev 173304)
</span><span class="lines">@@ -172,7 +172,7 @@
</span><span class="cx"> v(bool, callEdgeProfileReallyProcessesLog, true) \
</span><span class="cx"> v(bool, baselineDoesCallEdgeProfiling, false) \
</span><span class="cx"> v(bool, dfgDoesCallEdgeProfiling, true) \
</span><del>- v(bool, enableCallEdgeProfiling, false) \
</del><ins>+ v(bool, enableCallEdgeProfiling, true) \
</ins><span class="cx"> v(unsigned, frequentCallThreshold, 2) \
</span><span class="cx"> v(bool, optimizeNativeCalls, false) \
</span><span class="cx"> \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (173303 => 173304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-09-05 01:52:53 UTC (rev 173303)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2014-09-05 01:54:02 UTC (rev 173304)
</span><span class="lines">@@ -459,8 +459,11 @@
</span><span class="cx"> interpreter->stopSampling();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void VM::waitForCompilationsToComplete()
</del><ins>+void VM::prepareToDiscardCode()
</ins><span class="cx"> {
</span><ins>+ if (callEdgeLog)
+ callEdgeLog->processLog();
+
</ins><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> for (unsigned i = DFG::numberOfWorklists(); i--;) {
</span><span class="cx"> if (DFG::Worklist* worklist = DFG::worklistForIndexOrNull(i))
</span><span class="lines">@@ -471,7 +474,7 @@
</span><span class="cx">
</span><span class="cx"> void VM::discardAllCode()
</span><span class="cx"> {
</span><del>- waitForCompilationsToComplete();
</del><ins>+ prepareToDiscardCode();
</ins><span class="cx"> m_codeCache->clear();
</span><span class="cx"> m_regExpCache->invalidateCode();
</span><span class="cx"> heap.deleteAllCompiledCode();
</span><span class="lines">@@ -515,7 +518,7 @@
</span><span class="cx">
</span><span class="cx"> void VM::releaseExecutableMemory()
</span><span class="cx"> {
</span><del>- waitForCompilationsToComplete();
</del><ins>+ prepareToDiscardCode();
</ins><span class="cx">
</span><span class="cx"> if (entryScope) {
</span><span class="cx"> StackPreservingRecompiler recompiler;
</span><span class="lines">@@ -891,7 +894,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_enabledProfiler = profiler;
</span><span class="cx"> if (m_enabledProfiler) {
</span><del>- waitForCompilationsToComplete();
</del><ins>+ prepareToDiscardCode();
</ins><span class="cx"> SetEnabledProfilerFunctor functor;
</span><span class="cx"> heap.forEachCodeBlock(functor);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (173303 => 173304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2014-09-05 01:52:53 UTC (rev 173303)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2014-09-05 01:54:02 UTC (rev 173304)
</span><span class="lines">@@ -501,8 +501,8 @@
</span><span class="cx"> JSLock& apiLock() { return *m_apiLock; }
</span><span class="cx"> CodeCache* codeCache() { return m_codeCache.get(); }
</span><span class="cx">
</span><del>- void waitForCompilationsToComplete();
-
</del><ins>+ void prepareToDiscardCode();
+
</ins><span class="cx"> JS_EXPORT_PRIVATE void discardAllCode();
</span><span class="cx">
</span><span class="cx"> void registerWatchpointForImpureProperty(const Identifier&, Watchpoint*);
</span></span></pre>
</div>
</div>
</body>
</html>