<!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>[196280] 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/196280">196280</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-02-08 17:06:23 -0800 (Mon, 08 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>B3::foldPathConstants() needs to execute its insertion set
https://bugs.webkit.org/show_bug.cgi?id=154020
Reviewed by Saam Barati.
* b3/B3FoldPathConstants.cpp:
* b3/testb3.cpp:
(JSC::B3::testFoldPathEqual): Added this. It used to crash in validation.
(JSC::B3::run):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3FoldPathConstantscpp">trunk/Source/JavaScriptCore/b3/B3FoldPathConstants.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3cpp">trunk/Source/JavaScriptCore/b3/testb3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196279 => 196280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-08 23:29:38 UTC (rev 196279)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-09 01:06:23 UTC (rev 196280)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-02-08 Filip Pizlo <fpizlo@apple.com>
+
+ B3::foldPathConstants() needs to execute its insertion set
+ https://bugs.webkit.org/show_bug.cgi?id=154020
+
+ Reviewed by Saam Barati.
+
+ * b3/B3FoldPathConstants.cpp:
+ * b3/testb3.cpp:
+ (JSC::B3::testFoldPathEqual): Added this. It used to crash in validation.
+ (JSC::B3::run):
+
</ins><span class="cx"> 2016-02-08 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Introduce @isObject bytecode intrinsic and use it instead of JS implemented one
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3FoldPathConstantscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3FoldPathConstants.cpp (196279 => 196280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3FoldPathConstants.cpp 2016-02-08 23:29:38 UTC (rev 196279)
+++ trunk/Source/JavaScriptCore/b3/B3FoldPathConstants.cpp 2016-02-09 01:06:23 UTC (rev 196280)
</span><span class="lines">@@ -194,6 +194,7 @@
</span><span class="cx"> child = override.valueNode;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ m_insertionSet.execute(block);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (changed) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (196279 => 196280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-02-08 23:29:38 UTC (rev 196279)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-02-09 01:06:23 UTC (rev 196280)
</span><span class="lines">@@ -10037,6 +10037,34 @@
</span><span class="cx"> compile(proc);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void testFoldPathEqual()
+{
+ Procedure proc;
+ BasicBlock* root = proc.addBlock();
+ BasicBlock* thenBlock = proc.addBlock();
+ BasicBlock* elseBlock = proc.addBlock();
+
+ Value* arg = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
+
+ root->appendNew<ControlValue>(
+ proc, Branch, Origin(), arg, FrequentedBlock(thenBlock), FrequentedBlock(elseBlock));
+
+ thenBlock->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ thenBlock->appendNew<Value>(
+ proc, Equal, Origin(), arg, thenBlock->appendNew<ConstPtrValue>(proc, Origin(), 0)));
+
+ elseBlock->appendNew<ControlValue>(
+ proc, Return, Origin(),
+ elseBlock->appendNew<Value>(
+ proc, Equal, Origin(), arg, elseBlock->appendNew<ConstPtrValue>(proc, Origin(), 0)));
+
+ auto code = compile(proc);
+ CHECK(invoke<intptr_t>(*code, 0) == 1);
+ CHECK(invoke<intptr_t>(*code, 1) == 0);
+ CHECK(invoke<intptr_t>(*code, 42) == 0);
+}
+
</ins><span class="cx"> // Make sure the compiler does not try to optimize anything out.
</span><span class="cx"> NEVER_INLINE double zero()
</span><span class="cx"> {
</span><span class="lines">@@ -11435,10 +11463,9 @@
</span><span class="cx"> RUN(testSShrShl64(-42000000000, 8, 8));
</span><span class="cx">
</span><span class="cx"> RUN(testCheckMul64SShr());
</span><del>-
</del><span class="cx"> RUN(testComputeDivisionMagic<int32_t>(2, -2147483647, 0));
</span><del>-
</del><span class="cx"> RUN(testTrivialInfiniteLoop());
</span><ins>+ RUN(testFoldPathEqual());
</ins><span class="cx">
</span><span class="cx"> if (tasks.isEmpty())
</span><span class="cx"> usage();
</span></span></pre>
</div>
</div>
</body>
</html>