<!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>[259598] branches/safari-609.2.1.2-branch/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/259598">259598</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2020-04-06 15:47:10 -0700 (Mon, 06 Apr 2020)</dd>
</dl>

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

    [JSC] DFGArrayMode::alreadyChecked should have NonArray check when ArrayMode is NonArray+SlowPutArrayStorage
    https://bugs.webkit.org/show_bug.cgi?id=209791

    Reviewed by Saam Barati.

    DFGArrayMode::alreadyChecked with NonArray+SlowPutArrayStorage should check NonArray condition.

    * dfg/DFGArrayMode.cpp:
    (JSC::DFG::ArrayMode::alreadyChecked const):
    * dfg/DFGArrayMode.h:
    (JSC::DFG::ArrayMode::arrayModesWithIndexingShapes const):

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari609212branchSourceJavaScriptCoreChangeLog">branches/safari-609.2.1.2-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari609212branchSourceJavaScriptCoredfgDFGArrayModecpp">branches/safari-609.2.1.2-branch/Source/JavaScriptCore/dfg/DFGArrayMode.cpp</a></li>
<li><a href="#branchessafari609212branchSourceJavaScriptCoredfgDFGArrayModeh">branches/safari-609.2.1.2-branch/Source/JavaScriptCore/dfg/DFGArrayMode.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari609212branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-609.2.1.2-branch/Source/JavaScriptCore/ChangeLog (259597 => 259598)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-609.2.1.2-branch/Source/JavaScriptCore/ChangeLog 2020-04-06 21:59:37 UTC (rev 259597)
+++ branches/safari-609.2.1.2-branch/Source/JavaScriptCore/ChangeLog    2020-04-06 22:47:10 UTC (rev 259598)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2020-04-06  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r259264. rdar://problem/61352437
+
+    [JSC] DFGArrayMode::alreadyChecked should have NonArray check when ArrayMode is NonArray+SlowPutArrayStorage
+    https://bugs.webkit.org/show_bug.cgi?id=209791
+    
+    Reviewed by Saam Barati.
+    
+    DFGArrayMode::alreadyChecked with NonArray+SlowPutArrayStorage should check NonArray condition.
+    
+    * dfg/DFGArrayMode.cpp:
+    (JSC::DFG::ArrayMode::alreadyChecked const):
+    * dfg/DFGArrayMode.h:
+    (JSC::DFG::ArrayMode::arrayModesWithIndexingShapes const):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259264 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-03-30  Yusuke Suzuki  <ysuzuki@apple.com>
+
+            [JSC] DFGArrayMode::alreadyChecked should have NonArray check when ArrayMode is NonArray+SlowPutArrayStorage
+            https://bugs.webkit.org/show_bug.cgi?id=209791
+
+            Reviewed by Saam Barati.
+
+            DFGArrayMode::alreadyChecked with NonArray+SlowPutArrayStorage should check NonArray condition.
+
+            * dfg/DFGArrayMode.cpp:
+            (JSC::DFG::ArrayMode::alreadyChecked const):
+            * dfg/DFGArrayMode.h:
+            (JSC::DFG::ArrayMode::arrayModesWithIndexingShapes const):
+
</ins><span class="cx"> 2020-04-03  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r259355. rdar://problem/61269741
</span></span></pre></div>
<a id="branchessafari609212branchSourceJavaScriptCoredfgDFGArrayModecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-609.2.1.2-branch/Source/JavaScriptCore/dfg/DFGArrayMode.cpp (259597 => 259598)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-609.2.1.2-branch/Source/JavaScriptCore/dfg/DFGArrayMode.cpp      2020-04-06 21:59:37 UTC (rev 259597)
+++ branches/safari-609.2.1.2-branch/Source/JavaScriptCore/dfg/DFGArrayMode.cpp 2020-04-06 22:47:10 UTC (rev 259598)
</span><span class="lines">@@ -510,7 +510,8 @@
</span><span class="cx">         
</span><span class="cx">     case Array::SlowPutArrayStorage:
</span><span class="cx">         switch (arrayClass()) {
</span><del>-        case Array::OriginalArray: {
</del><ins>+        case Array::OriginalArray:
+        case Array::OriginalCopyOnWriteArray: {
</ins><span class="cx">             CRASH();
</span><span class="cx">             return false;
</span><span class="cx">         }
</span><span class="lines">@@ -529,8 +530,26 @@
</span><span class="cx">             }
</span><span class="cx">             return true;
</span><span class="cx">         }
</span><del>-        
-        default: {
</del><ins>+
+        // Array::OriginalNonArray can be shown when the value is a TypedArray with original structure.
+        // But here, we already filtered TypedArrays. So, just handle it like a NonArray.
+        case Array::NonArray:
+        case Array::OriginalNonArray: {
+            if (arrayModesAlreadyChecked(value.m_arrayModes, asArrayModesIgnoringTypedArrays(NonArrayWithArrayStorage) | asArrayModesIgnoringTypedArrays(NonArrayWithSlowPutArrayStorage)))
+                return true;
+            if (value.m_structure.isTop())
+                return false;
+            for (unsigned i = value.m_structure.size(); i--;) {
+                RegisteredStructure structure = value.m_structure[i];
+                if (!hasAnyArrayStorage(structure->indexingType()))
+                    return false;
+                if (structure->indexingType() & IsArray)
+                    return false;
+            }
+            return true;
+        }
+
+        case Array::PossiblyArray: {
</ins><span class="cx">             if (arrayModesAlreadyChecked(value.m_arrayModes, asArrayModesIgnoringTypedArrays(NonArrayWithArrayStorage) | asArrayModesIgnoringTypedArrays(ArrayWithArrayStorage) | asArrayModesIgnoringTypedArrays(NonArrayWithSlowPutArrayStorage) | asArrayModesIgnoringTypedArrays(ArrayWithSlowPutArrayStorage)))
</span><span class="cx">                 return true;
</span><span class="cx">             if (value.m_structure.isTop())
</span><span class="lines">@@ -541,7 +560,8 @@
</span><span class="cx">                     return false;
</span><span class="cx">             }
</span><span class="cx">             return true;
</span><del>-        } }
</del><ins>+        }
+        }
</ins><span class="cx">         
</span><span class="cx">     case Array::DirectArguments:
</span><span class="cx">         return speculationChecked(value.m_type, SpecDirectArguments);
</span></span></pre></div>
<a id="branchessafari609212branchSourceJavaScriptCoredfgDFGArrayModeh"></a>
<div class="modfile"><h4>Modified: branches/safari-609.2.1.2-branch/Source/JavaScriptCore/dfg/DFGArrayMode.h (259597 => 259598)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-609.2.1.2-branch/Source/JavaScriptCore/dfg/DFGArrayMode.h        2020-04-06 21:59:37 UTC (rev 259597)
+++ branches/safari-609.2.1.2-branch/Source/JavaScriptCore/dfg/DFGArrayMode.h   2020-04-06 22:47:10 UTC (rev 259598)
</span><span class="lines">@@ -531,10 +531,9 @@
</span><span class="cx">             if (hasInt32(shape) || hasDouble(shape) || hasContiguous(shape))
</span><span class="cx">                 return asArrayModesIgnoringTypedArrays(shape) | asArrayModesIgnoringTypedArrays(shape | IsArray) | asArrayModesIgnoringTypedArrays(shape | IsArray | CopyOnWrite);
</span><span class="cx">             return asArrayModesIgnoringTypedArrays(shape) | asArrayModesIgnoringTypedArrays(shape | IsArray);
</span><del>-        default:
-            // This is only necessary for C++ compilers that don't understand enums.
-            return 0;
</del><span class="cx">         }
</span><ins>+        // This is only necessary for C++ compilers that don't understand enums.
+        return 0;
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     template <typename... Args>
</span></span></pre>
</div>
</div>

</body>
</html>