<!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>[204866] trunk/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/204866">204866</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2016-08-23 16:19:14 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(204854): ASan is unhappy
https://bugs.webkit.org/show_bug.cgi?id=161109
Reviewed by Geoffrey Garen.
I messed up RegExpConstructor: it ends up being a callee and a large allocation.
This fixes it to not be a large allocation.
* dfg/DFGStrengthReductionPhase.cpp:
(JSC::DFG::StrengthReductionPhase::handleNode):
* runtime/InternalFunction.cpp:
(JSC::InternalFunction::InternalFunction):
* runtime/RegExp.cpp:
(JSC::RegExp::match):
(JSC::RegExp::matchConcurrently):
(JSC::RegExp::matchCompareWithInterpreter):
* runtime/RegExp.h:
* runtime/RegExpConstructor.h:
* runtime/RegExpInlines.h:
(JSC::RegExp::matchInline):
* runtime/RegExpPrototype.cpp:
(JSC::genericSplit):
* testRegExp.cpp:
(testOneRegExp):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGStrengthReductionPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeInternalFunctioncpp">trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpcpp">trunk/Source/JavaScriptCore/runtime/RegExp.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExph">trunk/Source/JavaScriptCore/runtime/RegExp.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpConstructorh">trunk/Source/JavaScriptCore/runtime/RegExpConstructor.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpInlinesh">trunk/Source/JavaScriptCore/runtime/RegExpInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp">trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoretestRegExpcpp">trunk/Source/JavaScriptCore/testRegExp.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (204865 => 204866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-23 23:16:54 UTC (rev 204865)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-23 23:19:14 UTC (rev 204866)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-08-23 Filip Pizlo <fpizlo@apple.com>
+
+ REGRESSION(204854): ASan is unhappy
+ https://bugs.webkit.org/show_bug.cgi?id=161109
+
+ Reviewed by Geoffrey Garen.
+
+ I messed up RegExpConstructor: it ends up being a callee and a large allocation.
+
+ This fixes it to not be a large allocation.
+
+ * dfg/DFGStrengthReductionPhase.cpp:
+ (JSC::DFG::StrengthReductionPhase::handleNode):
+ * runtime/InternalFunction.cpp:
+ (JSC::InternalFunction::InternalFunction):
+ * runtime/RegExp.cpp:
+ (JSC::RegExp::match):
+ (JSC::RegExp::matchConcurrently):
+ (JSC::RegExp::matchCompareWithInterpreter):
+ * runtime/RegExp.h:
+ * runtime/RegExpConstructor.h:
+ * runtime/RegExpInlines.h:
+ (JSC::RegExp::matchInline):
+ * runtime/RegExpPrototype.cpp:
+ (JSC::genericSplit):
+ * testRegExp.cpp:
+ (testOneRegExp):
+
</ins><span class="cx"> 2016-08-23 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> strict mode eval should not fire the var injection watch point
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGStrengthReductionPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp (204865 => 204866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp 2016-08-23 23:16:54 UTC (rev 204865)
+++ trunk/Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp 2016-08-23 23:19:14 UTC (rev 204866)
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> FrozenValue* constructorFrozenValue = m_graph.freeze(constructor);
</span><span class="cx">
</span><span class="cx"> MatchResult result;
</span><del>- Vector<int, 32> ovector;
</del><ins>+ Vector<int> ovector;
</ins><span class="cx"> // We have to call the kind of match function that the main thread would have called.
</span><span class="cx"> // Otherwise, we might not have the desired Yarr code compiled, and the match will fail.
</span><span class="cx"> if (m_node->op() == RegExpExec) {
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> bool ok = true;
</span><span class="cx"> do {
</span><span class="cx"> MatchResult result;
</span><del>- Vector<int, 32> ovector;
</del><ins>+ Vector<int> ovector;
</ins><span class="cx"> // Model which version of match() is called by the main thread.
</span><span class="cx"> if (replace.isEmpty() && regExp->global()) {
</span><span class="cx"> if (!regExp->matchConcurrently(vm(), string, startPosition, result)) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeInternalFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp (204865 => 204866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp 2016-08-23 23:16:54 UTC (rev 204865)
+++ trunk/Source/JavaScriptCore/runtime/InternalFunction.cpp 2016-08-23 23:19:14 UTC (rev 204866)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx"> InternalFunction::InternalFunction(VM& vm, Structure* structure)
</span><span class="cx"> : JSDestructibleObject(vm, structure)
</span><span class="cx"> {
</span><ins>+ // exec->vm() wants callees to not be large allocations.
+ RELEASE_ASSERT(!isLargeAllocation());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InternalFunction::finishCreation(VM& vm, const String& name)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExp.cpp (204865 => 204866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2016-08-23 23:16:54 UTC (rev 204865)
+++ trunk/Source/JavaScriptCore/runtime/RegExp.cpp 2016-08-23 23:19:14 UTC (rev 204866)
</span><span class="lines">@@ -296,13 +296,13 @@
</span><span class="cx"> m_regExpBytecode = Yarr::byteCompile(pattern, &vm->m_regExpAllocator, &vm->m_regExpAllocatorLock);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RegExp::match(VM& vm, const String& s, unsigned startOffset, Vector<int, 32>& ovector)
</del><ins>+int RegExp::match(VM& vm, const String& s, unsigned startOffset, Vector<int>& ovector)
</ins><span class="cx"> {
</span><span class="cx"> return matchInline(vm, s, startOffset, ovector);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RegExp::matchConcurrently(
</span><del>- VM& vm, const String& s, unsigned startOffset, int& position, Vector<int, 32>& ovector)
</del><ins>+ VM& vm, const String& s, unsigned startOffset, int& position, Vector<int>& ovector)
</ins><span class="cx"> {
</span><span class="cx"> ConcurrentJITLocker locker(m_lock);
</span><span class="cx">
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> void RegExp::matchCompareWithInterpreter(const String& s, int startOffset, int* offsetVector, int jitResult)
</span><span class="cx"> {
</span><span class="cx"> int offsetVectorSize = (m_numSubpatterns + 1) * 2;
</span><del>- Vector<int, 32> interpreterOvector;
</del><ins>+ Vector<int> interpreterOvector;
</ins><span class="cx"> interpreterOvector.resize(offsetVectorSize);
</span><span class="cx"> int* interpreterOffsetVector = interpreterOvector.data();
</span><span class="cx"> int interpreterResult = 0;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExp.h (204865 => 204866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExp.h 2016-08-23 23:16:54 UTC (rev 204865)
+++ trunk/Source/JavaScriptCore/runtime/RegExp.h 2016-08-23 23:19:14 UTC (rev 204866)
</span><span class="lines">@@ -64,10 +64,10 @@
</span><span class="cx"> bool isValid() const { return !m_constructionError && m_flags != InvalidFlags; }
</span><span class="cx"> const char* errorMessage() const { return m_constructionError; }
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE int match(VM&, const String&, unsigned startOffset, Vector<int, 32>& ovector);
</del><ins>+ JS_EXPORT_PRIVATE int match(VM&, const String&, unsigned startOffset, Vector<int>& ovector);
</ins><span class="cx">
</span><span class="cx"> // Returns false if we couldn't run the regular expression for any reason.
</span><del>- bool matchConcurrently(VM&, const String&, unsigned startOffset, int& position, Vector<int, 32>& ovector);
</del><ins>+ bool matchConcurrently(VM&, const String&, unsigned startOffset, int& position, Vector<int>& ovector);
</ins><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE MatchResult match(VM&, const String&, unsigned startOffset);
</span><span class="cx">
</span><span class="lines">@@ -74,7 +74,8 @@
</span><span class="cx"> bool matchConcurrently(VM&, const String&, unsigned startOffset, MatchResult&);
</span><span class="cx">
</span><span class="cx"> // Call these versions of the match functions if you're desperate for performance.
</span><del>- int matchInline(VM&, const String&, unsigned startOffset, Vector<int, 32>& ovector);
</del><ins>+ template<typename VectorType>
+ int matchInline(VM&, const String&, unsigned startOffset, VectorType& ovector);
</ins><span class="cx"> MatchResult matchInline(VM&, const String&, unsigned startOffset);
</span><span class="cx">
</span><span class="cx"> unsigned numSubpatterns() const { return m_numSubpatterns; }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpConstructorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpConstructor.h (204865 => 204866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpConstructor.h 2016-08-23 23:16:54 UTC (rev 204865)
+++ trunk/Source/JavaScriptCore/runtime/RegExpConstructor.h 2016-08-23 23:19:14 UTC (rev 204866)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> RegExpCachedResult m_cachedResult;
</span><span class="cx"> bool m_multiline;
</span><del>- Vector<int, 32> m_ovector;
</del><ins>+ Vector<int> m_ovector;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RegExpConstructor* asRegExpConstructor(JSValue);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpInlines.h (204865 => 204866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpInlines.h 2016-08-23 23:16:54 UTC (rev 204865)
+++ trunk/Source/JavaScriptCore/runtime/RegExpInlines.h 2016-08-23 23:19:14 UTC (rev 204866)
</span><span class="lines">@@ -94,7 +94,8 @@
</span><span class="cx"> compile(&vm, charSize);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ALWAYS_INLINE int RegExp::matchInline(VM& vm, const String& s, unsigned startOffset, Vector<int, 32>& ovector)
</del><ins>+template<typename VectorType>
+ALWAYS_INLINE int RegExp::matchInline(VM& vm, const String& s, unsigned startOffset, VectorType& ovector)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><span class="cx"> m_rtMatchCallCount++;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeRegExpPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp (204865 => 204866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-08-23 23:16:54 UTC (rev 204865)
+++ trunk/Source/JavaScriptCore/runtime/RegExpPrototype.cpp 2016-08-23 23:19:14 UTC (rev 204866)
</span><span class="lines">@@ -468,12 +468,14 @@
</span><span class="cx"> unsigned& matchPosition, bool regExpIsSticky, bool regExpIsUnicode,
</span><span class="cx"> const ControlFunc& control, const PushFunc& push)
</span><span class="cx"> {
</span><ins>+ Vector<int> ovector;
+
</ins><span class="cx"> while (matchPosition < inputSize) {
</span><span class="cx"> if (control() == AbortSplit)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Vector<int, 32> ovector;
-
</del><ins>+ ovector.resize(0);
+
</ins><span class="cx"> // a. Perform ? Set(splitter, "lastIndex", q, true).
</span><span class="cx"> // b. Let z be ? RegExpExec(splitter, S).
</span><span class="cx"> int mpos = regexp->match(vm, input, matchPosition, ovector);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestRegExpcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/testRegExp.cpp (204865 => 204866)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/testRegExp.cpp 2016-08-23 23:16:54 UTC (rev 204865)
+++ trunk/Source/JavaScriptCore/testRegExp.cpp 2016-08-23 23:19:14 UTC (rev 204866)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> static bool testOneRegExp(VM& vm, RegExp* regexp, RegExpTest* regExpTest, bool verbose, unsigned int lineNumber)
</span><span class="cx"> {
</span><span class="cx"> bool result = true;
</span><del>- Vector<int, 32> outVector;
</del><ins>+ Vector<int> outVector;
</ins><span class="cx"> outVector.resize(regExpTest->expectVector.size());
</span><span class="cx"> int matchResult = regexp->match(vm, regExpTest->subject, regExpTest->offset, outVector);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>