<!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>[285462] 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/285462">285462</a></dd>
<dt>Author</dt> <dd>kocsen_chung@apple.com</dd>
<dt>Date</dt> <dd>2021-11-08 17:09:06 -0800 (Mon, 08 Nov 2021)</dd>
</dl>

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

    RegExpExec can't statically prove which of the two structures it will get in AI by just looking at the RegExp*
    https://bugs.webkit.org/show_bug.cgi?id=231382
    <rdar://83722151>

    Reviewed by Mark Lam.

    JSTests:

    * stress/reg-exp-exec-cant-prove-which-structure-it-produces-in-ai.js: Added.
    (foo):

    Source/JavaScriptCore:

    Because of the RegExp.prototype.compile API, we don't know if the RegExp
    produced by RegExpExec will have indices or not, because that bit of
    information can be reset by the RegExp.prototype.compile API. So, we
    conservatively say that it can produce either structure.

    * dfg/DFGAbstractInterpreterInlines.h:
    (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283818 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="#branchessafari612branchSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">branches/safari-612-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari612branchJSTestsstressregexpexeccantprovewhichstructureitproducesinaijs">branches/safari-612-branch/JSTests/stress/reg-exp-exec-cant-prove-which-structure-it-produces-in-ai.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 (285461 => 285462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/JSTests/ChangeLog     2021-11-09 01:09:04 UTC (rev 285461)
+++ branches/safari-612-branch/JSTests/ChangeLog        2021-11-09 01:09:06 UTC (rev 285462)
</span><span class="lines">@@ -1,5 +1,44 @@
</span><span class="cx"> 2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r283818. rdar://problem/85173568
+
+    RegExpExec can't statically prove which of the two structures it will get in AI by just looking at the RegExp*
+    https://bugs.webkit.org/show_bug.cgi?id=231382
+    <rdar://83722151>
+    
+    Reviewed by Mark Lam.
+    
+    JSTests:
+    
+    * stress/reg-exp-exec-cant-prove-which-structure-it-produces-in-ai.js: Added.
+    (foo):
+    
+    Source/JavaScriptCore:
+    
+    Because of the RegExp.prototype.compile API, we don't know if the RegExp
+    produced by RegExpExec will have indices or not, because that bit of
+    information can be reset by the RegExp.prototype.compile API. So, we
+    conservatively say that it can produce either structure.
+    
+    * dfg/DFGAbstractInterpreterInlines.h:
+    (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283818 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-08  Saam Barati  <sbarati@apple.com>
+
+            RegExpExec can't statically prove which of the two structures it will get in AI by just looking at the RegExp*
+            https://bugs.webkit.org/show_bug.cgi?id=231382
+            <rdar://83722151>
+
+            Reviewed by Mark Lam.
+
+            * stress/reg-exp-exec-cant-prove-which-structure-it-produces-in-ai.js: Added.
+            (foo):
+
+2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
+
</ins><span class="cx">         Cherry-pick r283623. rdar://problem/85167292
</span><span class="cx"> 
</span><span class="cx">     Run backwards propagation before we prune the graph after ForceOSRExit nodes in BytecodeParser
</span></span></pre></div>
<a id="branchessafari612branchJSTestsstressregexpexeccantprovewhichstructureitproducesinaijs"></a>
<div class="addfile"><h4>Added: branches/safari-612-branch/JSTests/stress/reg-exp-exec-cant-prove-which-structure-it-produces-in-ai.js (0 => 285462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/JSTests/stress/reg-exp-exec-cant-prove-which-structure-it-produces-in-ai.js                           (rev 0)
+++ branches/safari-612-branch/JSTests/stress/reg-exp-exec-cant-prove-which-structure-it-produces-in-ai.js      2021-11-09 01:09:06 UTC (rev 285462)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+// This should not crash.
+
+function foo() {
+    let r = /a/;
+    r.compile(undefined, ...'d');
+    let a = r.exec(/b/);
+    a.x;
+}
+
+for (let i = 0; i < 1000; i++) {
+    foo();
+}
</ins></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/ChangeLog (285461 => 285462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/ChangeLog       2021-11-09 01:09:04 UTC (rev 285461)
+++ branches/safari-612-branch/Source/JavaScriptCore/ChangeLog  2021-11-09 01:09:06 UTC (rev 285462)
</span><span class="lines">@@ -1,5 +1,49 @@
</span><span class="cx"> 2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r283818. rdar://problem/85173568
+
+    RegExpExec can't statically prove which of the two structures it will get in AI by just looking at the RegExp*
+    https://bugs.webkit.org/show_bug.cgi?id=231382
+    <rdar://83722151>
+    
+    Reviewed by Mark Lam.
+    
+    JSTests:
+    
+    * stress/reg-exp-exec-cant-prove-which-structure-it-produces-in-ai.js: Added.
+    (foo):
+    
+    Source/JavaScriptCore:
+    
+    Because of the RegExp.prototype.compile API, we don't know if the RegExp
+    produced by RegExpExec will have indices or not, because that bit of
+    information can be reset by the RegExp.prototype.compile API. So, we
+    conservatively say that it can produce either structure.
+    
+    * dfg/DFGAbstractInterpreterInlines.h:
+    (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283818 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-08  Saam Barati  <sbarati@apple.com>
+
+            RegExpExec can't statically prove which of the two structures it will get in AI by just looking at the RegExp*
+            https://bugs.webkit.org/show_bug.cgi?id=231382
+            <rdar://83722151>
+
+            Reviewed by Mark Lam.
+
+            Because of the RegExp.prototype.compile API, we don't know if the RegExp
+            produced by RegExpExec will have indices or not, because that bit of
+            information can be reset by the RegExp.prototype.compile API. So, we
+            conservatively say that it can produce either structure.
+
+            * dfg/DFGAbstractInterpreterInlines.h:
+            (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+
+2021-11-08  Kocsen Chung  <kocsen_chung@apple.com>
+
</ins><span class="cx">         Cherry-pick r283623. rdar://problem/85167292
</span><span class="cx"> 
</span><span class="cx">     Run backwards propagation before we prune the graph after ForceOSRExit nodes in BytecodeParser
</span></span></pre></div>
<a id="branchessafari612branchSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (285461 => 285462)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h     2021-11-09 01:09:04 UTC (rev 285461)
+++ branches/safari-612-branch/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h        2021-11-09 01:09:06 UTC (rev 285462)
</span><span class="lines">@@ -2615,24 +2615,9 @@
</span><span class="cx">             if (JSGlobalObject* globalObject = jsDynamicCast<JSGlobalObject*>(m_vm, globalObjectValue)) {
</span><span class="cx">                 if (!globalObject->isHavingABadTime()) {
</span><span class="cx">                     m_graph.watchpoints().addLazily(globalObject->havingABadTimeWatchpoint());
</span><del>-
-                    RegExp* regExp = nullptr;
-                    if (node->op() == RegExpExec) {
-                        if (Node* regExpObjectNode = node->child2().node()) {
-                            if (RegExpObject* regExpObject = regExpObjectNode->dynamicCastConstant<RegExpObject*>(m_vm))
-                                regExp = regExpObject->regExp();
-                            else if (regExpObjectNode->op() == NewRegexp)
-                                regExp = regExpObjectNode->castOperand<RegExp*>();
-                        }
-                    } else if (node->op() == RegExpExecNonGlobalOrSticky)
-                        regExp = node->castOperand<RegExp*>();
-
</del><span class="cx">                     RegisteredStructureSet structureSet;
</span><del>-                    // If regExp is unknown, we need to put both regExp MatchesArray structure variants in our set.
-                    if (!regExp || !regExp->hasIndices())
-                        structureSet.add(m_graph.registerStructure(globalObject->regExpMatchesArrayStructure()));
-                    if (!regExp || regExp->hasIndices())
-                        structureSet.add(m_graph.registerStructure(globalObject->regExpMatchesArrayWithIndicesStructure()));
</del><ins>+                    structureSet.add(m_graph.registerStructure(globalObject->regExpMatchesArrayStructure()));
+                    structureSet.add(m_graph.registerStructure(globalObject->regExpMatchesArrayWithIndicesStructure()));
</ins><span class="cx">                     setForNode(node, structureSet);
</span><span class="cx">                     forNode(node).merge(SpecOther);
</span><span class="cx">                     break;
</span></span></pre>
</div>
</div>

</body>
</html>