<!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>[245928] branches/safari-607-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/245928">245928</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2019-05-30 17:30:23 -0700 (Thu, 30 May 2019)</dd>
</dl>

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

    [YARR] Properly handle RegExp's that require large ParenContext space
    https://bugs.webkit.org/show_bug.cgi?id=198065

    Reviewed by Keith Miller.

    JSTests:

    New test.

    * stress/regexp-large-paren-context.js: Added.
    (testLargeRegExp):

    Source/JavaScriptCore:

    Changed what happens when we exceed VM::patternContextBufferSize when compiling a RegExp
    that needs ParenCOntextSpace to fail the RegExp JIT compilation and fall back to the YARR
    interpreter.  This can save large amounts of JIT memory for a
    JIT'ed function that cannot ever succeed.

    * yarr/YarrJIT.cpp:
    (JSC::Yarr::YarrGenerator::initParenContextFreeList):
    (JSC::Yarr::YarrGenerator::compile):

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

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari607branchJSTestsChangeLog">branches/safari-607-branch/JSTests/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceJavaScriptCoreChangeLog">branches/safari-607-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceJavaScriptCoreyarrYarrJITcpp">branches/safari-607-branch/Source/JavaScriptCore/yarr/YarrJIT.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari607branchJSTestsstressregexplargeparencontextjs">branches/safari-607-branch/JSTests/stress/regexp-large-paren-context.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari607branchJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/JSTests/ChangeLog (245927 => 245928)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/JSTests/ChangeLog     2019-05-31 00:30:20 UTC (rev 245927)
+++ branches/safari-607-branch/JSTests/ChangeLog        2019-05-31 00:30:23 UTC (rev 245928)
</span><span class="lines">@@ -1,5 +1,47 @@
</span><span class="cx"> 2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r245815. rdar://problem/51264876
+
+    [YARR] Properly handle RegExp's that require large ParenContext space
+    https://bugs.webkit.org/show_bug.cgi?id=198065
+    
+    Reviewed by Keith Miller.
+    
+    JSTests:
+    
+    New test.
+    
+    * stress/regexp-large-paren-context.js: Added.
+    (testLargeRegExp):
+    
+    Source/JavaScriptCore:
+    
+    Changed what happens when we exceed VM::patternContextBufferSize when compiling a RegExp
+    that needs ParenCOntextSpace to fail the RegExp JIT compilation and fall back to the YARR
+    interpreter.  This can save large amounts of JIT memory for a
+    JIT'ed function that cannot ever succeed.
+    
+    * yarr/YarrJIT.cpp:
+    (JSC::Yarr::YarrGenerator::initParenContextFreeList):
+    (JSC::Yarr::YarrGenerator::compile):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245815 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-28  Michael Saboff  <msaboff@apple.com>
+
+            [YARR] Properly handle RegExp's that require large ParenContext space
+            https://bugs.webkit.org/show_bug.cgi?id=198065
+
+            Reviewed by Keith Miller.
+
+            New test.
+
+            * stress/regexp-large-paren-context.js: Added.
+            (testLargeRegExp):
+
+2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
+
</ins><span class="cx">         Cherry-pick r245586. rdar://problem/51264876
</span><span class="cx"> 
</span><span class="cx">     Cleanup Yarr regexp code around paren contexts.
</span></span></pre></div>
<a id="branchessafari607branchJSTestsstressregexplargeparencontextjs"></a>
<div class="addfile"><h4>Added: branches/safari-607-branch/JSTests/stress/regexp-large-paren-context.js (0 => 245928)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/JSTests/stress/regexp-large-paren-context.js                          (rev 0)
+++ branches/safari-607-branch/JSTests/stress/regexp-large-paren-context.js     2019-05-31 00:30:23 UTC (rev 245928)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+// Test the regular expresions that need lots of parenthesis context space work.
+// This includes falling back to the interpreter.
+
+function testLargeRegExp(terms)
+{
+    let s = '';
+    for (let i = 0; i < terms; i++) {
+        s += '(?:a){0,2}';
+    }
+
+    let r = new RegExp(s);
+    for (let i = 0; i < 10; i++)
+        ''.match(r);
+}
+
+testLargeRegExp(127);
+testLargeRegExp(128);
+testLargeRegExp(255);
+testLargeRegExp(256);
+testLargeRegExp(1000);
+
+
</ins></span></pre></div>
<a id="branchessafari607branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/JavaScriptCore/ChangeLog (245927 => 245928)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/JavaScriptCore/ChangeLog       2019-05-31 00:30:20 UTC (rev 245927)
+++ branches/safari-607-branch/Source/JavaScriptCore/ChangeLog  2019-05-31 00:30:23 UTC (rev 245928)
</span><span class="lines">@@ -1,5 +1,51 @@
</span><span class="cx"> 2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r245815. rdar://problem/51264876
+
+    [YARR] Properly handle RegExp's that require large ParenContext space
+    https://bugs.webkit.org/show_bug.cgi?id=198065
+    
+    Reviewed by Keith Miller.
+    
+    JSTests:
+    
+    New test.
+    
+    * stress/regexp-large-paren-context.js: Added.
+    (testLargeRegExp):
+    
+    Source/JavaScriptCore:
+    
+    Changed what happens when we exceed VM::patternContextBufferSize when compiling a RegExp
+    that needs ParenCOntextSpace to fail the RegExp JIT compilation and fall back to the YARR
+    interpreter.  This can save large amounts of JIT memory for a
+    JIT'ed function that cannot ever succeed.
+    
+    * yarr/YarrJIT.cpp:
+    (JSC::Yarr::YarrGenerator::initParenContextFreeList):
+    (JSC::Yarr::YarrGenerator::compile):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245815 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-28  Michael Saboff  <msaboff@apple.com>
+
+            [YARR] Properly handle RegExp's that require large ParenContext space
+            https://bugs.webkit.org/show_bug.cgi?id=198065
+
+            Reviewed by Keith Miller.
+
+            Changed what happens when we exceed VM::patternContextBufferSize when compiling a RegExp
+            that needs ParenCOntextSpace to fail the RegExp JIT compilation and fall back to the YARR
+            interpreter.  This can save large amounts of JIT memory for a
+            JIT'ed function that cannot ever succeed.
+
+            * yarr/YarrJIT.cpp:
+            (JSC::Yarr::YarrGenerator::initParenContextFreeList):
+            (JSC::Yarr::YarrGenerator::compile):
+
+2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
+
</ins><span class="cx">         Cherry-pick r245586. rdar://problem/51264876
</span><span class="cx"> 
</span><span class="cx">     Cleanup Yarr regexp code around paren contexts.
</span></span></pre></div>
<a id="branchessafari607branchSourceJavaScriptCoreyarrYarrJITcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/JavaScriptCore/yarr/YarrJIT.cpp (245927 => 245928)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/JavaScriptCore/yarr/YarrJIT.cpp        2019-05-31 00:30:20 UTC (rev 245927)
+++ branches/safari-607-branch/Source/JavaScriptCore/yarr/YarrJIT.cpp   2019-05-31 00:30:23 UTC (rev 245928)
</span><span class="lines">@@ -228,9 +228,10 @@
</span><span class="cx"> 
</span><span class="cx">         parenContextSize = WTF::roundUpToMultipleOf<sizeof(uintptr_t)>(parenContextSize);
</span><span class="cx"> 
</span><del>-        // Check that the paren context is a reasonable size.
-        if (parenContextSize > VM::patternContextBufferSize)
-            m_abortExecution.append(jump());
</del><ins>+        if (parenContextSize > VM::patternContextBufferSize) {
+            m_failureReason = JITFailureReason::ParenthesisNestedTooDeep;
+            return;
+        }
</ins><span class="cx"> 
</span><span class="cx">         Jump emptyFreeList = branchTestPtr(Zero, freelistRegister);
</span><span class="cx">         move(freelistRegister, parenContextPointer);
</span><span class="lines">@@ -3872,8 +3873,13 @@
</span><span class="cx">         initCallFrame();
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(YARR_JIT_ALL_PARENS_EXPRESSIONS)
</span><del>-        if (m_containsNestedSubpatterns)
</del><ins>+        if (m_containsNestedSubpatterns) {
</ins><span class="cx">             initParenContextFreeList();
</span><ins>+            if (m_failureReason) {
+                codeBlock.setFallBackWithFailureReason(*m_failureReason);
+                return;
+            }
+        }
</ins><span class="cx"> #endif
</span><span class="cx">         
</span><span class="cx">         if (m_pattern.m_saveInitialStartValue) {
</span></span></pre>
</div>
</div>

</body>
</html>