<!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>[208621] branches/safari-602-branch</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/208621">208621</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-11 15:50:28 -0800 (Fri, 11 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/208614">r208614</a>. rdar://problem/29225966</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchJSTestsChangeLog">branches/safari-602-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoreChangeLog">branches/safari-602-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoredfgDFGByteCodeParsercpp">branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchJSTestsstressdontdeadlockputbyvalasputbyidjs">branches/safari-602-branch/JSTests/stress/dont-dead-lock-put-by-val-as-put-by-id.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/JSTests/ChangeLog (208620 => 208621)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/JSTests/ChangeLog 2016-11-11 23:43:29 UTC (rev 208620)
+++ branches/safari-602-branch/JSTests/ChangeLog 2016-11-11 23:50:28 UTC (rev 208621)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-11-11 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r208614. rdar://problem/29225966
+
+ 2016-11-11 Saam Barati <sbarati@apple.com>
+
+ We recursively grab a lock in the DFGBytecodeParser causing us to deadlock
+ https://bugs.webkit.org/show_bug.cgi?id=164650
+
+ Reviewed by Geoffrey Garen.
+
+ * stress/dont-dead-lock-put-by-val-as-put-by-id.js: Added.
+ (ident):
+ (let.o.set foo):
+ (foo):
+
</ins><span class="cx"> 2016-10-27 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r207518. rdar://problem/28216050, rdar://problem/28216232
</span></span></pre></div>
<a id="branchessafari602branchJSTestsstressdontdeadlockputbyvalasputbyidjs"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/JSTests/stress/dont-dead-lock-put-by-val-as-put-by-id.js (0 => 208621)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/JSTests/stress/dont-dead-lock-put-by-val-as-put-by-id.js (rev 0)
+++ branches/safari-602-branch/JSTests/stress/dont-dead-lock-put-by-val-as-put-by-id.js 2016-11-11 23:50:28 UTC (rev 208621)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+function ident() { return "foo"; }
+noInline(ident);
+
+let o = {
+ set foo(x) {
+ foo(false);
+ }
+};
+
+function foo(cond) {
+ if (cond)
+ o[ident()] = 20;
+}
+
+for (let i = 0; i < 10000; i++) {
+ foo(true);
+}
</ins></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/ChangeLog (208620 => 208621)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-11-11 23:43:29 UTC (rev 208620)
+++ branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-11-11 23:50:28 UTC (rev 208621)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-11-11 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r208614. rdar://problem/29225966
+
+ 2016-11-11 Saam Barati <sbarati@apple.com>
+
+ We recursively grab a lock in the DFGBytecodeParser causing us to deadlock
+ https://bugs.webkit.org/show_bug.cgi?id=164650
+
+ Reviewed by Geoffrey Garen.
+
+ Some code was incorrectly holding a lock when recursively calling
+ back into the bytecode parser's via inlining a put_by_val as a put_by_id.
+ This can cause a deadlock if the inlinee CodeBlock is something we're
+ already holding a lock for. I've changed the range of the lock holder
+ to be as narrow as possible.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+
</ins><span class="cx"> 2016-11-03 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r208299. rdar://problem/28857505
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (208620 => 208621)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-11-11 23:43:29 UTC (rev 208620)
+++ branches/safari-602-branch/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-11-11 23:50:28 UTC (rev 208621)
</span><span class="lines">@@ -4128,23 +4128,24 @@
</span><span class="cx"> bool isDirect = opcodeID == op_put_by_val_direct;
</span><span class="cx"> bool compiledAsPutById = false;
</span><span class="cx"> {
</span><del>- ConcurrentJITLocker locker(m_inlineStackTop->m_profiledBlock->m_lock);
- ByValInfo* byValInfo = m_inlineStackTop->m_byValInfos.get(CodeOrigin(currentCodeOrigin().bytecodeIndex));
- // FIXME: When the bytecode is not compiled in the baseline JIT, byValInfo becomes null.
- // At that time, there is no information.
- if (byValInfo && byValInfo->stubInfo && !byValInfo->tookSlowPath && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadIdent)) {
- compiledAsPutById = true;
- unsigned identifierNumber = m_graph.identifiers().ensure(byValInfo->cachedId.impl());
- UniquedStringImpl* uid = m_graph.identifiers()[identifierNumber];
</del><ins>+ unsigned identifierNumber;
+ PutByIdStatus putByIdStatus;
+ {
+ ConcurrentJITLocker locker(m_inlineStackTop->m_profiledBlock->m_lock);
+ ByValInfo* byValInfo = m_inlineStackTop->m_byValInfos.get(CodeOrigin(currentCodeOrigin().bytecodeIndex));
+ // FIXME: When the bytecode is not compiled in the baseline JIT, byValInfo becomes null.
+ // At that time, there is no information.
+ if (byValInfo && byValInfo->stubInfo && !byValInfo->tookSlowPath && !m_inlineStackTop->m_exitProfile.hasExitSite(m_currentIndex, BadIdent)) {
+ compiledAsPutById = true;
+ identifierNumber = m_graph.identifiers().ensure(byValInfo->cachedId.impl());
+ UniquedStringImpl* uid = m_graph.identifiers()[identifierNumber];
</ins><span class="cx">
</span><del>- addToGraph(CheckIdent, OpInfo(uid), property);
</del><ins>+ addToGraph(CheckIdent, OpInfo(uid), property);
+ }
+ }
</ins><span class="cx">
</span><del>- PutByIdStatus putByIdStatus = PutByIdStatus::computeForStubInfo(
- locker, m_inlineStackTop->m_profiledBlock,
- byValInfo->stubInfo, currentCodeOrigin(), uid);
-
</del><ins>+ if (compiledAsPutById)
</ins><span class="cx"> handlePutById(base, identifierNumber, value, putByIdStatus, isDirect);
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!compiledAsPutById) {
</span></span></pre>
</div>
</div>
</body>
</html>