<!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>[246071] trunk</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/246071">246071</a></dd>
<dt>Author</dt> <dd>tzagallo@apple.com</dd>
<dt>Date</dt> <dd>2019-06-04 10:56:59 -0700 (Tue, 04 Jun 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Argument elimination should check for negative indices in GetByVal
https://bugs.webkit.org/show_bug.cgi?id=198302
<rdar://problem/51188095>

Reviewed by Filip Pizlo.

JSTests:

* stress/eliminate-arguments-negative-rest-access.js: Added.
(inlinee):
(opt):

Source/JavaScriptCore:

In DFG::ArgumentEliminationPhase, the index is treated as unsigned, but there's no check
for overflow in the addition. In compileGetMyArgumentByVal, there's a check for overflow,
but the index is treated as signed, resulting in an index lower than numberOfArgumentsToSkip.

* dfg/DFGArgumentsEliminationPhase.cpp:
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileGetMyArgumentByVal):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGArgumentsEliminationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstresseliminateargumentsnegativerestaccessjs">trunk/JSTests/stress/eliminate-arguments-negative-rest-access.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (246070 => 246071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2019-06-04 17:45:43 UTC (rev 246070)
+++ trunk/JSTests/ChangeLog     2019-06-04 17:56:59 UTC (rev 246071)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-06-04  Tadeu Zagallo  <tzagallo@apple.com>
+
+        Argument elimination should check for negative indices in GetByVal
+        https://bugs.webkit.org/show_bug.cgi?id=198302
+        <rdar://problem/51188095>
+
+        Reviewed by Filip Pizlo.
+
+        * stress/eliminate-arguments-negative-rest-access.js: Added.
+        (inlinee):
+        (opt):
+
</ins><span class="cx"> 2019-06-03  Caio Lima  <ticaiolima@gmail.com>
</span><span class="cx"> 
</span><span class="cx">         [ESNext][BigInt] Implement support for "**"
</span></span></pre></div>
<a id="trunkJSTestsstresseliminateargumentsnegativerestaccessjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/eliminate-arguments-negative-rest-access.js (0 => 246071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/eliminate-arguments-negative-rest-access.js                         (rev 0)
+++ trunk/JSTests/stress/eliminate-arguments-negative-rest-access.js    2019-06-04 17:56:59 UTC (rev 246071)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+//@ requireOptions("--forceEagerCompilation=1")
+
+function inlinee(index, value, ...rest) {
+    return rest[index | 0];
+}
+
+function opt() {
+    return inlinee(-1, 0x1234);
+}
+noInline(opt);
+
+for (let i = 0; i < 1e6; i++) {
+    const value = opt();
+    if (value !== undefined)
+        throw new Error(`${i}: ${value}`);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (246070 => 246071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2019-06-04 17:45:43 UTC (rev 246070)
+++ trunk/Source/JavaScriptCore/ChangeLog       2019-06-04 17:56:59 UTC (rev 246071)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2019-06-04  Tadeu Zagallo  <tzagallo@apple.com>
</span><span class="cx"> 
</span><ins>+        Argument elimination should check for negative indices in GetByVal
+        https://bugs.webkit.org/show_bug.cgi?id=198302
+        <rdar://problem/51188095>
+
+        Reviewed by Filip Pizlo.
+
+        In DFG::ArgumentEliminationPhase, the index is treated as unsigned, but there's no check
+        for overflow in the addition. In compileGetMyArgumentByVal, there's a check for overflow,
+        but the index is treated as signed, resulting in an index lower than numberOfArgumentsToSkip.
+
+        * dfg/DFGArgumentsEliminationPhase.cpp:
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::compileGetMyArgumentByVal):
+
+2019-06-04  Tadeu Zagallo  <tzagallo@apple.com>
+
</ins><span class="cx">         JSScript should not keep bytecode cache in memory
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=198482
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGArgumentsEliminationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp (246070 => 246071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp 2019-06-04 17:45:43 UTC (rev 246070)
+++ trunk/Source/JavaScriptCore/dfg/DFGArgumentsEliminationPhase.cpp    2019-06-04 17:56:59 UTC (rev 246071)
</span><span class="lines">@@ -762,11 +762,11 @@
</span><span class="cx">                         InlineCallFrame* inlineCallFrame = candidate->origin.semantic.inlineCallFrame();
</span><span class="cx">                         index += numberOfArgumentsToSkip;
</span><span class="cx">                         
</span><del>-                        bool safeToGetStack;
</del><ins>+                        bool safeToGetStack = index >= numberOfArgumentsToSkip;
</ins><span class="cx">                         if (inlineCallFrame)
</span><del>-                            safeToGetStack = index < inlineCallFrame->argumentCountIncludingThis - 1;
</del><ins>+                            safeToGetStack &= index < inlineCallFrame->argumentCountIncludingThis - 1;
</ins><span class="cx">                         else {
</span><del>-                            safeToGetStack =
</del><ins>+                            safeToGetStack &=
</ins><span class="cx">                                 index < static_cast<unsigned>(codeBlock()->numParameters()) - 1;
</span><span class="cx">                         }
</span><span class="cx">                         if (safeToGetStack) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (246070 => 246071)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp      2019-06-04 17:45:43 UTC (rev 246070)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2019-06-04 17:56:59 UTC (rev 246071)
</span><span class="lines">@@ -4461,13 +4461,15 @@
</span><span class="cx">         
</span><span class="cx">         LValue numberOfArgs = m_out.sub(numberOfArgsIncludingThis, m_out.int32One);
</span><span class="cx">         LValue indexToCheck = originalIndex;
</span><ins>+        LValue numberOfArgumentsToSkip = m_out.int32Zero;
</ins><span class="cx">         if (m_node->numberOfArgumentsToSkip()) {
</span><del>-            CheckValue* check = m_out.speculateAdd(indexToCheck, m_out.constInt32(m_node->numberOfArgumentsToSkip()));
</del><ins>+            numberOfArgumentsToSkip = m_out.constInt32(m_node->numberOfArgumentsToSkip());
+            CheckValue* check = m_out.speculateAdd(indexToCheck, numberOfArgumentsToSkip);
</ins><span class="cx">             blessSpeculation(check, Overflow, noValue(), nullptr, m_origin);
</span><span class="cx">             indexToCheck = check;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        LValue isOutOfBounds = m_out.aboveOrEqual(indexToCheck, numberOfArgs);
</del><ins>+        LValue isOutOfBounds = m_out.bitOr(m_out.aboveOrEqual(indexToCheck, numberOfArgs), m_out.below(indexToCheck, numberOfArgumentsToSkip));
</ins><span class="cx">         LBasicBlock continuation = nullptr;
</span><span class="cx">         LBasicBlock lastNext = nullptr;
</span><span class="cx">         ValueFromBlock slowResult;
</span></span></pre>
</div>
</div>

</body>
</html>