<!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>[285850] 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/285850">285850</a></dd>
<dt>Author</dt> <dd>ysuzuki@apple.com</dd>
<dt>Date</dt> <dd>2021-11-15 19:48:45 -0800 (Mon, 15 Nov 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JSC] Use operation path when PutByVal child1 is not speculated as a Cell
https://bugs.webkit.org/show_bug.cgi?id=233147
rdar://85344310

Reviewed by Mark Lam.

JSTests:

* stress/put-by-val-slow-dfg.js: Added.
(foo):

Source/JavaScriptCore:

<a href="http://trac.webkit.org/projects/webkit/changeset/285530">r285530</a> removed non CellUse / non KnownCellUse case incorrectly (when we do not have Cell edge,
then we should use the slow operation path). This patch recovers it.

* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compilePutByVal):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compilePutByVal):</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="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp">trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressputbyvalslowdfgjs">trunk/JSTests/stress/put-by-val-slow-dfg.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (285849 => 285850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2021-11-16 03:20:12 UTC (rev 285849)
+++ trunk/JSTests/ChangeLog     2021-11-16 03:48:45 UTC (rev 285850)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-11-15  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Use operation path when PutByVal child1 is not speculated as a Cell
+        https://bugs.webkit.org/show_bug.cgi?id=233147
+        rdar://85344310
+
+        Reviewed by Mark Lam.
+
+        * stress/put-by-val-slow-dfg.js: Added.
+        (foo):
+
</ins><span class="cx"> 2021-11-15  Angelos Oikonomopoulos  <angelos@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Skip tests newly-failing on mips
</span></span></pre></div>
<a id="trunkJSTestsstressputbyvalslowdfgjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/put-by-val-slow-dfg.js (0 => 285850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/put-by-val-slow-dfg.js                              (rev 0)
+++ trunk/JSTests/stress/put-by-val-slow-dfg.js 2021-11-16 03:48:45 UTC (rev 285850)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+function foo(a0) {
+  a0[0] = undefined;
+}
+
+for (let i = 0; i < 100000; i++) {
+  foo(0);
+  foo([]);
+  foo('');
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (285849 => 285850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-11-16 03:20:12 UTC (rev 285849)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-11-16 03:48:45 UTC (rev 285850)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2021-11-15  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Use operation path when PutByVal child1 is not speculated as a Cell
+        https://bugs.webkit.org/show_bug.cgi?id=233147
+        rdar://85344310
+
+        Reviewed by Mark Lam.
+
+        r285530 removed non CellUse / non KnownCellUse case incorrectly (when we do not have Cell edge,
+        then we should use the slow operation path). This patch recovers it.
+
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::compilePutByVal):
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::compilePutByVal):
+
</ins><span class="cx"> 2021-11-14  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [JSC] Use CallLinkInfo in LLInt
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (285849 => 285850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp    2021-11-16 03:20:12 UTC (rev 285849)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp       2021-11-16 03:48:45 UTC (rev 285850)
</span><span class="lines">@@ -2626,6 +2626,11 @@
</span><span class="cx"> void SpeculativeJIT::compilePutByVal(Node* node)
</span><span class="cx"> {
</span><span class="cx">     ArrayMode arrayMode = node->arrayMode().modeForPut();
</span><ins>+    Edge child1 = m_jit.graph().varArgChild(node, 0);
+    Edge child2 = m_jit.graph().varArgChild(node, 1);
+    Edge child3 = m_jit.graph().varArgChild(node, 2);
+    Edge child4 = m_jit.graph().varArgChild(node, 3);
+
</ins><span class="cx">     switch (arrayMode.type()) {
</span><span class="cx">     case Array::AnyTypedArray:
</span><span class="cx">     case Array::ForceExit:
</span><span class="lines">@@ -2648,22 +2653,22 @@
</span><span class="cx"> #endif
</span><span class="cx">     case Array::Generic: {
</span><span class="cx">         DFG_ASSERT(m_jit.graph(), node, node->op() == PutByVal || node->op() == PutByValDirect, node->op());
</span><del>-        if (m_graph.m_slowPutByVal.contains(node)) {
-            if (m_jit.graph().varArgChild(node, 0).useKind() == CellUse) {
-                if (m_jit.graph().varArgChild(node, 1).useKind() == StringUse) {
</del><ins>+        if (m_graph.m_slowPutByVal.contains(node) || (child1.useKind() != CellUse && child1.useKind() != KnownCellUse)) {
+            if (child1.useKind() == CellUse || child1.useKind() == KnownCellUse) {
+                if (child2.useKind() == StringUse) {
</ins><span class="cx">                     compilePutByValForCellWithString(node);
</span><span class="cx">                     break;
</span><span class="cx">                 }
</span><span class="cx"> 
</span><del>-                if (m_jit.graph().varArgChild(node, 1).useKind() == SymbolUse) {
</del><ins>+                if (child2.useKind() == SymbolUse) {
</ins><span class="cx">                     compilePutByValForCellWithSymbol(node);
</span><span class="cx">                     break;
</span><span class="cx">                 }
</span><span class="cx">             }
</span><span class="cx"> 
</span><del>-            JSValueOperand base(this, m_jit.graph().varArgChild(node, 0));
-            JSValueOperand property(this, m_jit.graph().varArgChild(node, 1));
-            JSValueOperand value(this, m_jit.graph().varArgChild(node, 2));
</del><ins>+            JSValueOperand base(this, child1);
+            JSValueOperand property(this, child2);
+            JSValueOperand value(this, child3);
</ins><span class="cx">             JSValueRegs baseRegs = base.jsValueRegs();
</span><span class="cx">             JSValueRegs propertyRegs = property.jsValueRegs();
</span><span class="cx">             JSValueRegs valueRegs = value.jsValueRegs();
</span><span class="lines">@@ -2679,9 +2684,9 @@
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        JSValueOperand base(this, m_jit.graph().varArgChild(node, 0), ManualOperandSpeculation);
-        JSValueOperand property(this, m_jit.graph().varArgChild(node, 1), ManualOperandSpeculation);
-        JSValueOperand value(this, m_jit.graph().varArgChild(node, 2), ManualOperandSpeculation);
</del><ins>+        JSValueOperand base(this, child1, ManualOperandSpeculation);
+        JSValueOperand property(this, child2, ManualOperandSpeculation);
+        JSValueOperand value(this, child3, ManualOperandSpeculation);
</ins><span class="cx">         JSValueRegs baseRegs = base.jsValueRegs();
</span><span class="cx">         JSValueRegs propertyRegs = property.jsValueRegs();
</span><span class="cx">         JSValueRegs valueRegs = value.jsValueRegs();
</span><span class="lines">@@ -2693,9 +2698,9 @@
</span><span class="cx">             stubInfoGPR = stubInfo.gpr();
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        speculate(node, m_jit.graph().varArgChild(node, 0));
-        speculate(node, m_jit.graph().varArgChild(node, 1));
-        speculate(node, m_jit.graph().varArgChild(node, 2));
</del><ins>+        speculate(node, child1);
+        speculate(node, child2);
+        speculate(node, child3);
</ins><span class="cx"> 
</span><span class="cx">         CodeOrigin codeOrigin = node->origin.semantic;
</span><span class="cx">         CallSiteIndex callSite = m_jit.recordCallSiteAndGenerateExceptionHandlingOSRExitIfNeeded(codeOrigin, m_stream->size());
</span><span class="lines">@@ -2707,11 +2712,11 @@
</span><span class="cx">             m_jit.codeBlock(), &m_jit.jitCode()->common.m_stubInfos, JITType::DFGJIT, codeOrigin, callSite, AccessType::PutByVal, usedRegisters,
</span><span class="cx">             baseRegs, propertyRegs, valueRegs, InvalidGPRReg, stubInfoGPR);
</span><span class="cx"> 
</span><del>-        if (m_state.forNode(m_jit.graph().varArgChild(node, 1)).isType(SpecString))
</del><ins>+        if (m_state.forNode(child2).isType(SpecString))
</ins><span class="cx">             gen.stubInfo()->propertyIsString = true;
</span><del>-        else if (m_state.forNode(m_jit.graph().varArgChild(node, 1)).isType(SpecInt32Only))
</del><ins>+        else if (m_state.forNode(child2).isType(SpecInt32Only))
</ins><span class="cx">             gen.stubInfo()->propertyIsInt32 = true;
</span><del>-        else if (m_state.forNode(m_jit.graph().varArgChild(node, 1)).isType(SpecSymbol))
</del><ins>+        else if (m_state.forNode(child2).isType(SpecSymbol))
</ins><span class="cx">             gen.stubInfo()->propertyIsSymbol = true;
</span><span class="cx"> 
</span><span class="cx">         gen.generateFastPath(m_jit);
</span><span class="lines">@@ -2739,7 +2744,7 @@
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">     case Array::Int32: {
</span><del>-        speculateInt32(m_jit.graph().varArgChild(node, 2));
</del><ins>+        speculateInt32(child3);
</ins><span class="cx">         FALLTHROUGH;
</span><span class="cx">     }
</span><span class="cx">     case Array::Contiguous: {
</span><span class="lines">@@ -2752,10 +2757,10 @@
</span><span class="cx">     }
</span><span class="cx">     case Array::ArrayStorage:
</span><span class="cx">     case Array::SlowPutArrayStorage: {
</span><del>-        SpeculateCellOperand base(this, m_jit.graph().varArgChild(node, 0));
-        SpeculateStrictInt32Operand property(this, m_jit.graph().varArgChild(node, 1));
-        JSValueOperand value(this, m_jit.graph().varArgChild(node, 2));
-        StorageOperand storage(this, m_jit.graph().varArgChild(node, 3));
</del><ins>+        SpeculateCellOperand base(this, child1);
+        SpeculateStrictInt32Operand property(this, child2);
+        JSValueOperand value(this, child3);
+        StorageOperand storage(this, child4);
</ins><span class="cx"> 
</span><span class="cx">         GPRReg baseReg = base.gpr();
</span><span class="cx">         GPRReg propertyReg = property.gpr();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (285849 => 285850)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp      2021-11-16 03:20:12 UTC (rev 285849)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2021-11-16 03:48:45 UTC (rev 285850)
</span><span class="lines">@@ -5720,7 +5720,7 @@
</span><span class="cx">         case Array::BigUint64Array:
</span><span class="cx">         case Array::Generic: {
</span><span class="cx">             if (m_graph.m_slowPutByVal.contains(m_node) || (child1.useKind() != CellUse && child1.useKind() != KnownCellUse)) {
</span><del>-                if (child1.useKind() == CellUse) {
</del><ins>+                if (child1.useKind() == CellUse || child1.useKind() == KnownCellUse) {
</ins><span class="cx">                     V_JITOperation_GCCJ operation = nullptr;
</span><span class="cx">                     if (child2.useKind() == StringUse) {
</span><span class="cx">                         if (m_node->op() == PutByValDirect) {
</span></span></pre>
</div>
</div>

</body>
</html>