<!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>[179536] 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/179536">179536</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-02 20:29:24 -0800 (Mon, 02 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>MultiGetByOffset should be marked NodeMustGenerate
https://bugs.webkit.org/show_bug.cgi?id=140137
Reviewed by Michael Saboff.
* dfg/DFGNode.h:
(JSC::DFG::Node::convertToGetByOffset): We were sloppy - we should also clear NodeMustGenerate once it's a GetByOffset.
(JSC::DFG::Node::convertToMultiGetByOffset): Assert that we converted from something that already had NodeMustGenerate.
* dfg/DFGNodeType.h: We shouldn't DCE a node that does checks and could be effectful in baseline. Making MultiGetByOffset as NodeMustGenerate prevents DCE. FTL could still DCE the actual loads, but the checks will stay.
* tests/stress/multi-get-by-offset-dce.js: Added. This previously failed because the getter wasn't called.
(foo):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeh">trunk/Source/JavaScriptCore/dfg/DFGNode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGNodeTypeh">trunk/Source/JavaScriptCore/dfg/DFGNodeType.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressmultigetbyoffsetdcejs">trunk/Source/JavaScriptCore/tests/stress/multi-get-by-offset-dce.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (179535 => 179536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-02-03 04:11:42 UTC (rev 179535)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-02-03 04:29:24 UTC (rev 179536)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-02-02 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ MultiGetByOffset should be marked NodeMustGenerate
+ https://bugs.webkit.org/show_bug.cgi?id=140137
+
+ Reviewed by Michael Saboff.
+
+ * dfg/DFGNode.h:
+ (JSC::DFG::Node::convertToGetByOffset): We were sloppy - we should also clear NodeMustGenerate once it's a GetByOffset.
+ (JSC::DFG::Node::convertToMultiGetByOffset): Assert that we converted from something that already had NodeMustGenerate.
+ * dfg/DFGNodeType.h: We shouldn't DCE a node that does checks and could be effectful in baseline. Making MultiGetByOffset as NodeMustGenerate prevents DCE. FTL could still DCE the actual loads, but the checks will stay.
+ * tests/stress/multi-get-by-offset-dce.js: Added. This previously failed because the getter wasn't called.
+ (foo):
+
+2015-02-02 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> [FTL] inlined GetMyArgumentByVal with no arguments passed causes instant crash
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=141180
</span><span class="cx"> rdar://problem/19677552
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNode.h (179535 => 179536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNode.h 2015-02-03 04:11:42 UTC (rev 179535)
+++ trunk/Source/JavaScriptCore/dfg/DFGNode.h 2015-02-03 04:29:24 UTC (rev 179536)
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> children.child2().setUseKind(KnownCellUse);
</span><span class="cx"> children.setChild1(storage);
</span><span class="cx"> m_op = GetByOffset;
</span><del>- m_flags &= ~NodeClobbersWorld;
</del><ins>+ m_flags &= ~(NodeClobbersWorld | NodeMustGenerate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void convertToMultiGetByOffset(MultiGetByOffsetData* data)
</span><span class="lines">@@ -488,6 +488,7 @@
</span><span class="cx"> child1().setUseKind(CellUse);
</span><span class="cx"> m_op = MultiGetByOffset;
</span><span class="cx"> m_flags &= ~NodeClobbersWorld;
</span><ins>+ ASSERT(m_flags & NodeMustGenerate);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void convertToPutByOffset(StorageAccessData& data, Edge storage)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGNodeTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGNodeType.h (179535 => 179536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2015-02-03 04:11:42 UTC (rev 179535)
+++ trunk/Source/JavaScriptCore/dfg/DFGNodeType.h 2015-02-03 04:29:24 UTC (rev 179536)
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> macro(GetSetter, NodeResultJS) \
</span><span class="cx"> macro(GetByOffset, NodeResultJS) \
</span><span class="cx"> macro(GetGetterSetterByOffset, NodeResultJS) \
</span><del>- macro(MultiGetByOffset, NodeResultJS) \
</del><ins>+ macro(MultiGetByOffset, NodeResultJS | NodeMustGenerate) \
</ins><span class="cx"> macro(PutByOffset, NodeMustGenerate) \
</span><span class="cx"> macro(MultiPutByOffset, NodeMustGenerate) \
</span><span class="cx"> macro(GetArrayLength, NodeResultInt32) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressmultigetbyoffsetdcejs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/multi-get-by-offset-dce.js (0 => 179536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/multi-get-by-offset-dce.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/multi-get-by-offset-dce.js 2015-02-03 04:29:24 UTC (rev 179536)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+function foo(o) {
+ var tmp = o.f;
+ return 42;
+}
+
+noInline(foo);
+
+var array = [{f:1}, {g:1, f:2}];
+for (var i = 0; i < 10000; ++i) {
+ var result = foo(array[i % array.length]);
+ if (result != 42)
+ throw "Error: bad result in loop: " + result;
+}
+
+var o = {};
+var didCallGetter = false;
+o.__defineGetter__("f", function() { didCallGetter = true; return 73; });
+var result = foo(o);
+if (result != 42)
+ throw "Error: bad result at end: " + result;
+if (!didCallGetter)
+ throw "Error: did not call getter at end.";
</ins></span></pre>
</div>
</div>
</body>
</html>