<!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>[203413] 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/203413">203413</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-07-19 12:20:02 -0700 (Tue, 19 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>B3 methods that mutate the successors array should take FrequentedBlock by value
https://bugs.webkit.org/show_bug.cgi?id=159935
Reviewed by Michael Saboff.
This bug was found by ASan testing. setSuccessors() takes a const FrequentedBlock&, and the
caller that caused the ASan crash was doing:
block->setSuccessors(block->notTaken())
So, inside setSuccessors(), after we resize() the successors array, the const
FrequentedBlock& points to nonsense.
The fix is to pass FrequentedBlock by value in all of these kinds of methods.
No new tests, but ASan testing catches this instantly for anything that triggers CFG
simplification in B3. So like half of our tests.
* b3/B3BasicBlock.cpp:
(JSC::B3::BasicBlock::clearSuccessors):
(JSC::B3::BasicBlock::appendSuccessor):
(JSC::B3::BasicBlock::setSuccessors):
* b3/B3BasicBlock.h:
(JSC::B3::BasicBlock::successors):
(JSC::B3::BasicBlock::successorBlock):
* b3/B3Value.cpp:
(JSC::B3::Value::replaceWithPhi):
(JSC::B3::Value::replaceWithJump):
(JSC::B3::Value::replaceWithOops):
* b3/B3Value.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3BasicBlockcpp">trunk/Source/JavaScriptCore/b3/B3BasicBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3BasicBlockh">trunk/Source/JavaScriptCore/b3/B3BasicBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Valuecpp">trunk/Source/JavaScriptCore/b3/B3Value.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3Valueh">trunk/Source/JavaScriptCore/b3/B3Value.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (203412 => 203413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-19 18:14:02 UTC (rev 203412)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-19 19:20:02 UTC (rev 203413)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-07-19 Filip Pizlo <fpizlo@apple.com>
+
+ B3 methods that mutate the successors array should take FrequentedBlock by value
+ https://bugs.webkit.org/show_bug.cgi?id=159935
+
+ Reviewed by Michael Saboff.
+
+ This bug was found by ASan testing. setSuccessors() takes a const FrequentedBlock&, and the
+ caller that caused the ASan crash was doing:
+
+ block->setSuccessors(block->notTaken())
+
+ So, inside setSuccessors(), after we resize() the successors array, the const
+ FrequentedBlock& points to nonsense.
+
+ The fix is to pass FrequentedBlock by value in all of these kinds of methods.
+
+ No new tests, but ASan testing catches this instantly for anything that triggers CFG
+ simplification in B3. So like half of our tests.
+
+ * b3/B3BasicBlock.cpp:
+ (JSC::B3::BasicBlock::clearSuccessors):
+ (JSC::B3::BasicBlock::appendSuccessor):
+ (JSC::B3::BasicBlock::setSuccessors):
+ * b3/B3BasicBlock.h:
+ (JSC::B3::BasicBlock::successors):
+ (JSC::B3::BasicBlock::successorBlock):
+ * b3/B3Value.cpp:
+ (JSC::B3::Value::replaceWithPhi):
+ (JSC::B3::Value::replaceWithJump):
+ (JSC::B3::Value::replaceWithOops):
+ * b3/B3Value.h:
+
</ins><span class="cx"> 2016-07-18 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Make builtin TypeErrors consistent
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3BasicBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3BasicBlock.cpp (203412 => 203413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3BasicBlock.cpp 2016-07-19 18:14:02 UTC (rev 203412)
+++ trunk/Source/JavaScriptCore/b3/B3BasicBlock.cpp 2016-07-19 19:20:02 UTC (rev 203413)
</span><span class="lines">@@ -90,18 +90,18 @@
</span><span class="cx"> m_successors.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BasicBlock::appendSuccessor(const FrequentedBlock& target)
</del><ins>+void BasicBlock::appendSuccessor(FrequentedBlock target)
</ins><span class="cx"> {
</span><span class="cx"> m_successors.append(target);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BasicBlock::setSuccessors(const FrequentedBlock& target)
</del><ins>+void BasicBlock::setSuccessors(FrequentedBlock target)
</ins><span class="cx"> {
</span><span class="cx"> m_successors.resize(1);
</span><span class="cx"> m_successors[0] = target;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BasicBlock::setSuccessors(const FrequentedBlock& taken, const FrequentedBlock& notTaken)
</del><ins>+void BasicBlock::setSuccessors(FrequentedBlock taken, FrequentedBlock notTaken)
</ins><span class="cx"> {
</span><span class="cx"> m_successors.resize(2);
</span><span class="cx"> m_successors[0] = taken;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3BasicBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3BasicBlock.h (203412 => 203413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3BasicBlock.h 2016-07-19 18:14:02 UTC (rev 203412)
+++ trunk/Source/JavaScriptCore/b3/B3BasicBlock.h 2016-07-19 19:20:02 UTC (rev 203413)
</span><span class="lines">@@ -95,9 +95,9 @@
</span><span class="cx"> SuccessorList& successors() { return m_successors; }
</span><span class="cx">
</span><span class="cx"> void clearSuccessors();
</span><del>- JS_EXPORT_PRIVATE void appendSuccessor(const FrequentedBlock&);
- void setSuccessors(const FrequentedBlock&);
- void setSuccessors(const FrequentedBlock&, const FrequentedBlock&);
</del><ins>+ JS_EXPORT_PRIVATE void appendSuccessor(FrequentedBlock);
+ void setSuccessors(FrequentedBlock);
+ void setSuccessors(FrequentedBlock, FrequentedBlock);
</ins><span class="cx">
</span><span class="cx"> BasicBlock* successorBlock(unsigned index) const { return successor(index).block(); }
</span><span class="cx"> BasicBlock*& successorBlock(unsigned index) { return successor(index).block(); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Valuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Value.cpp (203412 => 203413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Value.cpp 2016-07-19 18:14:02 UTC (rev 203412)
+++ trunk/Source/JavaScriptCore/b3/B3Value.cpp 2016-07-19 19:20:02 UTC (rev 203413)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> this->m_index = index;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Value::replaceWithJump(BasicBlock* owner, const FrequentedBlock& target)
</del><ins>+void Value::replaceWithJump(BasicBlock* owner, FrequentedBlock target)
</ins><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(owner->last() == this);
</span><span class="cx">
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> owner->clearSuccessors();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Value::replaceWithJump(const FrequentedBlock& target)
</del><ins>+void Value::replaceWithJump(FrequentedBlock target)
</ins><span class="cx"> {
</span><span class="cx"> replaceWithJump(owner, target);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3Valueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3Value.h (203412 => 203413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3Value.h 2016-07-19 18:14:02 UTC (rev 203412)
+++ trunk/Source/JavaScriptCore/b3/B3Value.h 2016-07-19 19:20:02 UTC (rev 203413)
</span><span class="lines">@@ -113,11 +113,11 @@
</span><span class="cx"> void replaceWithPhi();
</span><span class="cx">
</span><span class="cx"> // These transformations are only valid for terminals.
</span><del>- void replaceWithJump(BasicBlock* owner, const FrequentedBlock&);
</del><ins>+ void replaceWithJump(BasicBlock* owner, FrequentedBlock);
</ins><span class="cx"> void replaceWithOops(BasicBlock* owner);
</span><span class="cx">
</span><span class="cx"> // You can use this form if owners are valid. They're usually not valid.
</span><del>- void replaceWithJump(const FrequentedBlock&);
</del><ins>+ void replaceWithJump(FrequentedBlock);
</ins><span class="cx"> void replaceWithOops();
</span><span class="cx">
</span><span class="cx"> void dump(PrintStream&) const;
</span></span></pre>
</div>
</div>
</body>
</html>