<!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>[281029] 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/281029">281029</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2021-08-13 12:29:04 -0700 (Fri, 13 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>EnumeratorNextUpdatePropertyName always needs to be able to handle IndexedMode
https://bugs.webkit.org/show_bug.cgi?id=229087

Reviewed by Filip Pizlo.

JSTests:

* stress/for-in-own-structure-and-generic-with-late-add-indexed.js: Added.
(test):
(Foo):

Source/JavaScriptCore:

Right now, this operation incorrectly assumes that EnumeratorNextUpdateIndexAndMode will guarantee
the mode matches the seen mode set. But no speculation is guaranteed and adding such a guarantee
would require adding checkpoints, which is likely not worth it. Instead, this patch just makes
sure we always handle the allocation for IndexedMode.

* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileEnumeratorNextUpdatePropertyName):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileCompareStrictEq):</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="#trunkJSTestsstressforinownstructureandgenericwithlateaddindexedjs">trunk/JSTests/stress/for-in-own-structure-and-generic-with-late-add-indexed.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (281028 => 281029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2021-08-13 19:10:25 UTC (rev 281028)
+++ trunk/JSTests/ChangeLog     2021-08-13 19:29:04 UTC (rev 281029)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-08-13  Keith Miller  <keith_miller@apple.com>
+
+        EnumeratorNextUpdatePropertyName always needs to be able to handle IndexedMode
+        https://bugs.webkit.org/show_bug.cgi?id=229087
+
+        Reviewed by Filip Pizlo.
+
+        * stress/for-in-own-structure-and-generic-with-late-add-indexed.js: Added.
+        (test):
+        (Foo):
+
</ins><span class="cx"> 2021-08-11  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         WTFCrash in JSC::Lexer<char16_t>::append8
</span></span></pre></div>
<a id="trunkJSTestsstressforinownstructureandgenericwithlateaddindexedjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/for-in-own-structure-and-generic-with-late-add-indexed.js (0 => 281029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/for-in-own-structure-and-generic-with-late-add-indexed.js                           (rev 0)
+++ trunk/JSTests/stress/for-in-own-structure-and-generic-with-late-add-indexed.js      2021-08-13 19:29:04 UTC (rev 281029)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+function test(o) {
+    let sum = 0;
+    for (let i in o)
+        sum += o[i];
+    return sum;
+}
+noInline(test);
+
+Object.defineProperty(Object.prototype, "foo", { enumerable: true, value: 4 });
+
+class Foo extends Array {
+    b = 1;
+}
+
+let object = new Foo();
+let object2 = new Foo();
+object2.length = 100;
+object2.fill(1);
+
+for (let i = 0; i < 1e5; ++i) {
+    let sum = test(object);
+    if (sum !== 5)
+        throw new Error(sum);
+}
+
+let sum = test(object2);
+if (sum !== 105)
+    throw new Error(sum);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (281028 => 281029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-08-13 19:10:25 UTC (rev 281028)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-08-13 19:29:04 UTC (rev 281029)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-08-13  Keith Miller  <keith_miller@apple.com>
+
+        EnumeratorNextUpdatePropertyName always needs to be able to handle IndexedMode
+        https://bugs.webkit.org/show_bug.cgi?id=229087
+
+        Reviewed by Filip Pizlo.
+
+        Right now, this operation incorrectly assumes that EnumeratorNextUpdateIndexAndMode will guarantee
+        the mode matches the seen mode set. But no speculation is guaranteed and adding such a guarantee
+        would require adding checkpoints, which is likely not worth it. Instead, this patch just makes
+        sure we always handle the allocation for IndexedMode.
+
+        * dfg/DFGSpeculativeJIT.cpp:
+        (JSC::DFG::SpeculativeJIT::compileEnumeratorNextUpdatePropertyName):
+        * ftl/FTLLowerDFGToB3.cpp:
+        (JSC::FTL::DFG::LowerDFGToB3::compileCompareStrictEq):
+
</ins><span class="cx"> 2021-08-12  Mark Lam  <mark.lam@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Refactor some ARM64EHash code.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (281028 => 281029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp    2021-08-13 19:10:25 UTC (rev 281028)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp       2021-08-13 19:29:04 UTC (rev 281029)
</span><span class="lines">@@ -13591,17 +13591,13 @@
</span><span class="cx">     MacroAssembler::JumpList doneCases;
</span><span class="cx">     MacroAssembler::Jump operationCall;
</span><span class="cx"> 
</span><del>-    bool needsOperation = seenModes.contains(JSPropertyNameEnumerator::IndexedMode);
</del><ins>+    // Make sure we flush on all code paths if we will call the operation.
+    // Note: we can't omit the operation because we are not guaranteed EnumeratorUpdateIndexAndMode will speculate on the mode.
+    flushRegisters();
</ins><span class="cx"> 
</span><del>-    // Make sure we flush on all code paths if we could call the operation.
-    if (needsOperation)
-        flushRegisters();
-
</del><span class="cx">     if (seenModes.containsAny({ JSPropertyNameEnumerator::OwnStructureMode, JSPropertyNameEnumerator::GenericMode })) {
</span><ins>+        operationCall = m_jit.branchTest32(MacroAssembler::NonZero, mode, TrustedImm32(JSPropertyNameEnumerator::IndexedMode));
</ins><span class="cx"> 
</span><del>-        if (needsOperation)
-            operationCall = m_jit.branchTest32(MacroAssembler::NonZero, mode, TrustedImm32(JSPropertyNameEnumerator::IndexedMode));
-
</del><span class="cx">         auto outOfBounds = m_jit.branch32(MacroAssembler::AboveOrEqual, index, MacroAssembler::Address(enumerator, JSPropertyNameEnumerator::endGenericPropertyIndexOffset()));
</span><span class="cx"> 
</span><span class="cx">         m_jit.loadPtr(MacroAssembler::Address(enumerator, JSPropertyNameEnumerator::cachedPropertyNamesVectorOffset()), resultRegs.payloadGPR());
</span><span class="lines">@@ -13613,16 +13609,12 @@
</span><span class="cx"> 
</span><span class="cx">         outOfBounds.link(&m_jit);
</span><span class="cx">         m_jit.moveTrustedValue(jsNull(), resultRegs);
</span><ins>+        doneCases.append(m_jit.jump());
+        operationCall.link(&m_jit);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (needsOperation) {
-        if (operationCall.isSet()) {
-            doneCases.append(m_jit.jump());
-            operationCall.link(&m_jit);
-        }
-        callOperation(operationEnumeratorNextUpdatePropertyName, resultRegs, TrustedImmPtr::weakPointer(m_graph, m_graph.globalObjectFor(node->origin.semantic)), index, mode, enumerator);
-        m_jit.exceptionCheck();
-    }
</del><ins>+    callOperation(operationEnumeratorNextUpdatePropertyName, resultRegs, TrustedImmPtr::weakPointer(m_graph, m_graph.globalObjectFor(node->origin.semantic)), index, mode, enumerator);
+    m_jit.exceptionCheck();
</ins><span class="cx"> 
</span><span class="cx">     doneCases.link(&m_jit);
</span><span class="cx">     jsValueResult(resultRegs, node);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (281028 => 281029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp      2021-08-13 19:10:25 UTC (rev 281028)
+++ trunk/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2021-08-13 19:29:04 UTC (rev 281029)
</span><span class="lines">@@ -13138,20 +13138,15 @@
</span><span class="cx">         OptionSet seenModes = m_node->enumeratorMetadata();
</span><span class="cx"> 
</span><span class="cx">         if (seenModes.containsAny({ JSPropertyNameEnumerator::OwnStructureMode, JSPropertyNameEnumerator::GenericMode })) {
</span><del>-            LBasicBlock checkIndex = nullptr;
</del><ins>+            LBasicBlock checkIndex = m_out.newBlock();
</ins><span class="cx">             LBasicBlock outOfBoundsBlock = m_out.newBlock();
</span><span class="cx">             LBasicBlock loadPropertyNameBlock = m_out.newBlock();
</span><span class="cx">             continuation = m_out.newBlock();
</span><ins>+            operationBlock = m_out.newBlock();
</ins><span class="cx"> 
</span><del>-            if (seenModes.contains(JSPropertyNameEnumerator::IndexedMode)) {
-                checkIndex = m_out.newBlock();
-                operationBlock = m_out.newBlock();
-                m_out.branch(m_out.testIsZero32(mode, m_out.constInt32(JSPropertyNameEnumerator::IndexedMode)), unsure(checkIndex), unsure(operationBlock));
-            }
-
</del><ins>+            m_out.branch(m_out.testIsZero32(mode, m_out.constInt32(JSPropertyNameEnumerator::IndexedMode)), unsure(checkIndex), unsure(operationBlock));
</ins><span class="cx">             {
</span><del>-                if (checkIndex)
-                    m_out.appendTo(checkIndex);
</del><ins>+                m_out.appendTo(checkIndex);
</ins><span class="cx">                 LValue outOfBounds = m_out.aboveOrEqual(index, m_out.load32(enumerator, m_heaps.JSPropertyNameEnumerator_endGenericPropertyIndex));
</span><span class="cx">                 m_out.branch(outOfBounds, unsure(outOfBoundsBlock), unsure(loadPropertyNameBlock));
</span><span class="cx">             }
</span><span class="lines">@@ -13170,17 +13165,15 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (seenModes.contains(JSPropertyNameEnumerator::IndexedMode)) {
-            if (operationBlock)
-                m_out.appendTo(operationBlock);
-            results.append(m_out.anchor(vmCall(Int64, operationEnumeratorNextUpdatePropertyName, weakPointer(globalObject), index, mode, enumerator)));
-            if (continuation)
-                m_out.jump(continuation);
</del><ins>+        if (operationBlock)
+            m_out.appendTo(operationBlock);
+        // Note: We can't omit the operation because we have no guarantee that the mode will match what we profiled.
+        results.append(m_out.anchor(vmCall(Int64, operationEnumeratorNextUpdatePropertyName, weakPointer(globalObject), index, mode, enumerator)));
+        if (continuation) {
+            m_out.jump(continuation);
+            m_out.appendTo(continuation);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (continuation)
-            m_out.appendTo(continuation);
-
</del><span class="cx">         ASSERT(results.size());
</span><span class="cx">         LValue result = m_out.phi(Int64, results);
</span><span class="cx">         setJSValue(result);
</span></span></pre>
</div>
</div>

</body>
</html>