<!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>[281474] branches/safari-612-branch</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/281474">281474</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2021-08-23 15:00:37 -0700 (Mon, 23 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/281473">r281473</a>. rdar://problem/82262986

    compileEnumeratorHasProperty uses flushRegisters incorrectly
    https://bugs.webkit.org/show_bug.cgi?id=229412
    <rdar://82020767>

    Reviewed by Keith Miller.

    JSTests:

    * stress/for-in-has-own-property-shouldnt-flush-registers.js: Added.
    (foo):
    * stress/for-in-in-by-val-shouldnt-flush-registers.js: Added.
    (a.toString):

    Source/JavaScriptCore:

    We were calling flushRegisters() inside code that isn't always runs inside the
    EnumeratorInByVal/EnumeratorHasOwnProperty nodes. That is a violation of how
    flushRegisters() must be used, since flushRegisters() updates global register
    allocation state, and therefore must run each time a node is run. To fix, we
    move flushRegisters() before the code starts emitting branches.

    * dfg/DFGSpeculativeJIT.cpp:
    (JSC::DFG::SpeculativeJIT::compileEnumeratorHasProperty):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281473 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchJSTestsChangeLog">branches/safari-612-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceJavaScriptCoreChangeLog">branches/safari-612-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceJavaScriptCoredfgDFGSpeculativeJITcpp">branches/safari-612-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari612branchJSTestsstressforinhasownpropertyshouldntflushregistersjs">branches/safari-612-branch/JSTests/stress/for-in-has-own-property-shouldnt-flush-registers.js</a></li>
<li><a href="#branchessafari612branchJSTestsstressforininbyvalshouldntflushregistersjs">branches/safari-612-branch/JSTests/stress/for-in-in-by-val-shouldnt-flush-registers.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/JSTests/ChangeLog (281473 => 281474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/JSTests/ChangeLog     2021-08-23 21:44:19 UTC (rev 281473)
+++ branches/safari-612-branch/JSTests/ChangeLog        2021-08-23 22:00:37 UTC (rev 281474)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2021-08-23  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r281473. rdar://problem/82262986
+
+    compileEnumeratorHasProperty uses flushRegisters incorrectly
+    https://bugs.webkit.org/show_bug.cgi?id=229412
+    <rdar://82020767>
+    
+    Reviewed by Keith Miller.
+    
+    JSTests:
+    
+    * stress/for-in-has-own-property-shouldnt-flush-registers.js: Added.
+    (foo):
+    * stress/for-in-in-by-val-shouldnt-flush-registers.js: Added.
+    (a.toString):
+    
+    Source/JavaScriptCore:
+    
+    We were calling flushRegisters() inside code that isn't always runs inside the
+    EnumeratorInByVal/EnumeratorHasOwnProperty nodes. That is a violation of how
+    flushRegisters() must be used, since flushRegisters() updates global register
+    allocation state, and therefore must run each time a node is run. To fix, we
+    move flushRegisters() before the code starts emitting branches.
+    
+    * dfg/DFGSpeculativeJIT.cpp:
+    (JSC::DFG::SpeculativeJIT::compileEnumeratorHasProperty):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281473 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-23  Saam Barati  <sbarati@apple.com>
+
+            compileEnumeratorHasProperty uses flushRegisters incorrectly
+            https://bugs.webkit.org/show_bug.cgi?id=229412
+            <rdar://82020767>
+
+            Reviewed by Keith Miller.
+
+            * stress/for-in-has-own-property-shouldnt-flush-registers.js: Added.
+            (foo):
+            * stress/for-in-in-by-val-shouldnt-flush-registers.js: Added.
+            (a.toString):
+
</ins><span class="cx"> 2021-08-17  Mikhail R. Gadelha  <mikhail@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed. Skip failing MIPS tests
</span></span></pre></div>
<a id="branchessafari612branchJSTestsstressforinhasownpropertyshouldntflushregistersjs"></a>
<div class="addfile"><h4>Added: branches/safari-612-branch/JSTests/stress/for-in-has-own-property-shouldnt-flush-registers.js (0 => 281474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/JSTests/stress/for-in-has-own-property-shouldnt-flush-registers.js                            (rev 0)
+++ branches/safari-612-branch/JSTests/stress/for-in-has-own-property-shouldnt-flush-registers.js       2021-08-23 22:00:37 UTC (rev 281474)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+function foo(o) {
+    for (let p in o) {
+        o.hasOwnProperty(p);
+        o.__proto__ = undefined;
+    }
+}
+
+for (let i = 0; i < 100000; ++i) {
+    foo({f:42});
+}
+
</ins></span></pre></div>
<a id="branchessafari612branchJSTestsstressforininbyvalshouldntflushregistersjs"></a>
<div class="addfile"><h4>Added: branches/safari-612-branch/JSTests/stress/for-in-in-by-val-shouldnt-flush-registers.js (0 => 281474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/JSTests/stress/for-in-in-by-val-shouldnt-flush-registers.js                           (rev 0)
+++ branches/safari-612-branch/JSTests/stress/for-in-in-by-val-shouldnt-flush-registers.js      2021-08-23 22:00:37 UTC (rev 281474)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+const a = [undefined];
+a.toString = ()=>{};
+
+function foo() {
+    for (let x in a) {
+      x in a;
+      +x;
+    }
+}
+
+for (let i=0; i<10000; i++) {
+  foo();
+}
</ins></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/ChangeLog (281473 => 281474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/ChangeLog       2021-08-23 21:44:19 UTC (rev 281473)
+++ branches/safari-612-branch/Source/JavaScriptCore/ChangeLog  2021-08-23 22:00:37 UTC (rev 281474)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2021-08-23  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r281473. rdar://problem/82262986
+
+    compileEnumeratorHasProperty uses flushRegisters incorrectly
+    https://bugs.webkit.org/show_bug.cgi?id=229412
+    <rdar://82020767>
+    
+    Reviewed by Keith Miller.
+    
+    JSTests:
+    
+    * stress/for-in-has-own-property-shouldnt-flush-registers.js: Added.
+    (foo):
+    * stress/for-in-in-by-val-shouldnt-flush-registers.js: Added.
+    (a.toString):
+    
+    Source/JavaScriptCore:
+    
+    We were calling flushRegisters() inside code that isn't always runs inside the
+    EnumeratorInByVal/EnumeratorHasOwnProperty nodes. That is a violation of how
+    flushRegisters() must be used, since flushRegisters() updates global register
+    allocation state, and therefore must run each time a node is run. To fix, we
+    move flushRegisters() before the code starts emitting branches.
+    
+    * dfg/DFGSpeculativeJIT.cpp:
+    (JSC::DFG::SpeculativeJIT::compileEnumeratorHasProperty):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@281473 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-08-23  Saam Barati  <sbarati@apple.com>
+
+            compileEnumeratorHasProperty uses flushRegisters incorrectly
+            https://bugs.webkit.org/show_bug.cgi?id=229412
+            <rdar://82020767>
+
+            Reviewed by Keith Miller.
+
+            We were calling flushRegisters() inside code that isn't always runs inside the
+            EnumeratorInByVal/EnumeratorHasOwnProperty nodes. That is a violation of how
+            flushRegisters() must be used, since flushRegisters() updates global register
+            allocation state, and therefore must run each time a node is run. To fix, we
+            move flushRegisters() before the code starts emitting branches.
+
+            * dfg/DFGSpeculativeJIT.cpp:
+            (JSC::DFG::SpeculativeJIT::compileEnumeratorHasProperty):
+
</ins><span class="cx"> 2021-08-18  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [JSC] Remove op_has_indexed_property related code
</span></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (281473 => 281474)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp       2021-08-23 21:44:19 UTC (rev 281473)
+++ branches/safari-612-branch/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp  2021-08-23 22:00:37 UTC (rev 281474)
</span><span class="lines">@@ -13743,6 +13743,8 @@
</span><span class="cx">         GPRReg modeGPR = mode.gpr();
</span><span class="cx">         GPRReg enumeratorGPR = enumerator.gpr();
</span><span class="cx"> 
</span><ins>+        flushRegisters();
+
</ins><span class="cx">         JSValueRegsTemporary result(this);
</span><span class="cx">         JSValueRegs resultRegs = result.regs();
</span><span class="cx"> 
</span><span class="lines">@@ -13762,7 +13764,6 @@
</span><span class="cx"> 
</span><span class="cx">         operationCases.link(&m_jit);
</span><span class="cx"> 
</span><del>-        flushRegisters();
</del><span class="cx"> #if USE(JSVALUE32_64)
</span><span class="cx">         m_jit.move(TrustedImm32(JSValue::CellTag), resultRegs.tagGPR());
</span><span class="cx">         auto baseRegs = JSValueRegs(baseCellGPR, resultRegs.tagGPR());
</span></span></pre>
</div>
</div>

</body>
</html>