<!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>[209440] 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/209440">209440</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-12-06 18:52:35 -0800 (Tue, 06 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>DumpRenderTree ASSERT in JSC::ExecutableBase::isHostFunction seen on bots
https://bugs.webkit.org/show_bug.cgi?id=165497
<rdar://problem/29538973>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-12-06
Reviewed by Saam Barati.
* inspector/agents/InspectorScriptProfilerAgent.cpp:
(Inspector::InspectorScriptProfilerAgent::trackingComplete):
Defer collection when extracting and processing the samples to avoid
any objects held by the samples from getting collected while processing.
This is because while processing we call into functions that can
allocate and we must prevent those functions from syncing with the
GC thread which may collect other sample data yet to be processed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorScriptProfilerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209439 => 209440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-07 01:23:54 UTC (rev 209439)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-07 02:52:35 UTC (rev 209440)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ DumpRenderTree ASSERT in JSC::ExecutableBase::isHostFunction seen on bots
+ https://bugs.webkit.org/show_bug.cgi?id=165497
+ <rdar://problem/29538973>
+
+ Reviewed by Saam Barati.
+
+ * inspector/agents/InspectorScriptProfilerAgent.cpp:
+ (Inspector::InspectorScriptProfilerAgent::trackingComplete):
+ Defer collection when extracting and processing the samples to avoid
+ any objects held by the samples from getting collected while processing.
+ This is because while processing we call into functions that can
+ allocate and we must prevent those functions from syncing with the
+ GC thread which may collect other sample data yet to be processed.
+
</ins><span class="cx"> 2016-12-06 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Correct SDKROOT values in xcconfig files
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorScriptProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp (209439 => 209440)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp 2016-12-07 01:23:54 UTC (rev 209439)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp 2016-12-07 02:52:35 UTC (rev 209440)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorScriptProfilerAgent.h"
</span><span class="cx">
</span><ins>+#include "DeferGC.h"
+#include "HeapInlines.h"
</ins><span class="cx"> #include "InspectorEnvironment.h"
</span><span class="cx"> #include "SamplingProfiler.h"
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="lines">@@ -203,8 +205,10 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SAMPLING_PROFILER)
</span><span class="cx"> if (m_enabledSamplingProfiler) {
</span><del>- JSLockHolder lock(m_environment.scriptDebugServer().vm());
- SamplingProfiler* samplingProfiler = m_environment.scriptDebugServer().vm().samplingProfiler();
</del><ins>+ VM& vm = m_environment.scriptDebugServer().vm();
+ JSLockHolder lock(vm);
+ DeferGC deferGC(vm.heap);
+ SamplingProfiler* samplingProfiler = vm.samplingProfiler();
</ins><span class="cx"> RELEASE_ASSERT(samplingProfiler);
</span><span class="cx">
</span><span class="cx"> LockHolder locker(samplingProfiler->getLock());
</span><span class="lines">@@ -212,7 +216,7 @@
</span><span class="cx"> Vector<SamplingProfiler::StackTrace> stackTraces = samplingProfiler->releaseStackTraces(locker);
</span><span class="cx"> locker.unlockEarly();
</span><span class="cx">
</span><del>- Ref<Protocol::ScriptProfiler::Samples> samples = buildSamples(m_environment.scriptDebugServer().vm(), WTFMove(stackTraces));
</del><ins>+ Ref<Protocol::ScriptProfiler::Samples> samples = buildSamples(vm, WTFMove(stackTraces));
</ins><span class="cx">
</span><span class="cx"> m_enabledSamplingProfiler = false;
</span><span class="cx">
</span><span class="lines">@@ -230,8 +234,9 @@
</span><span class="cx"> if (!m_enabledSamplingProfiler)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- JSLockHolder lock(m_environment.scriptDebugServer().vm());
- SamplingProfiler* samplingProfiler = m_environment.scriptDebugServer().vm().samplingProfiler();
</del><ins>+ VM& vm = m_environment.scriptDebugServer().vm();
+ JSLockHolder lock(vm);
+ SamplingProfiler* samplingProfiler = vm.samplingProfiler();
</ins><span class="cx"> RELEASE_ASSERT(samplingProfiler);
</span><span class="cx"> LockHolder locker(samplingProfiler->getLock());
</span><span class="cx"> samplingProfiler->pause(locker);
</span></span></pre>
</div>
</div>
</body>
</html>