<!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>[198274] releases/WebKitGTK/webkit-2.12/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/198274">198274</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-16 08:14:03 -0700 (Wed, 16 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert "Merge <a href="http://trac.webkit.org/projects/webkit/changeset/197729">r197729</a> - createRegExpMatchesArray should allocate substrings more quickly"
This reverts commit 5127c006fe6f7fcb4a512376866bce75b83a1c27.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeJSStringh">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSString.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeRegExpMatchesArraycpp">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog (198273 => 198274)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-03-16 15:13:51 UTC (rev 198273)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-03-16 15:14:03 UTC (rev 198274)
</span><span class="lines">@@ -43,31 +43,6 @@
</span><span class="cx"> * runtime/RegExpCachedResult.h:
</span><span class="cx"> (JSC::RegExpCachedResult::record):
</span><span class="cx">
</span><del>-2016-03-07 Filip Pizlo <fpizlo@apple.com>
-
- createRegExpMatchesArray should allocate substrings more quickly
- https://bugs.webkit.org/show_bug.cgi?id=155160
-
- Reviewed by Sam Weinig.
-
- This was calling a version of jsSubstring() that isn't inlineable because it was doing a lot
- of checks in finishCreation(). In particular, it was checking that the base string is not
- itself a substring and that it's been resolved. We don't need those checks here, since the
- string must have been resolved prior to regexp processing.
-
- This patch is also smart about whether to do checks for the empty and full substrings. In
- the matches array loop, these checks are super unlikely to be profitable, so we just
- unconditionally allocate the substring.
-
- This removes those checks and makes the allocation inlineable. It looks like a 1% speed-up
- on Octane/regexp.
-
- * runtime/JSString.h:
- (JSC::jsSubstring):
- (JSC::jsSubstringOfResolved):
- * runtime/RegExpMatchesArray.cpp:
- (JSC::createRegExpMatchesArray):
-
</del><span class="cx"> 2016-03-07 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Small clean up of how we use SSA's valuesAtHead
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeJSStringh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSString.h (198273 => 198274)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSString.h 2016-03-16 15:13:51 UTC (rev 198273)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSString.h 2016-03-16 15:14:03 UTC (rev 198274)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- ALWAYS_INLINE JSRopeString(VM& vm)
</del><ins>+ JSRopeString(VM& vm)
</ins><span class="cx"> : JSString(vm)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -317,18 +317,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ALWAYS_INLINE void finishCreationSubstringOfResolved(VM& vm, JSString* base, unsigned offset, unsigned length)
- {
- Base::finishCreation(vm);
- ASSERT(!sumOverflows<int32_t>(offset, length));
- ASSERT(offset + length <= base->length());
- m_length = length;
- setIs8Bit(base->is8Bit());
- setIsSubstring(true);
- substringBase().set(vm, this, base);
- substringOffset() = offset;
- }
-
</del><span class="cx"> void finishCreation(VM& vm)
</span><span class="cx"> {
</span><span class="cx"> JSString::finishCreation(vm);
</span><span class="lines">@@ -374,13 +362,6 @@
</span><span class="cx"> return newString;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ALWAYS_INLINE static JSString* createSubstringOfResolved(VM& vm, JSString* base, unsigned offset, unsigned length)
- {
- JSRopeString* newString = new (NotNull, allocateCell<JSRopeString>(vm.heap)) JSRopeString(vm);
- newString->finishCreationSubstringOfResolved(vm, base, offset, length);
- return newString;
- }
-
</del><span class="cx"> void visitFibers(SlotVisitor&);
</span><span class="cx">
</span><span class="cx"> static ptrdiff_t offsetOfFibers() { return OBJECT_OFFSETOF(JSRopeString, u); }
</span><span class="lines">@@ -572,18 +553,6 @@
</span><span class="cx"> return JSRopeString::create(vm, exec, s, offset, length);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline JSString* jsSubstringOfResolved(VM& vm, JSString* s, unsigned offset, unsigned length)
-{
- ASSERT(offset <= static_cast<unsigned>(s->length()));
- ASSERT(length <= static_cast<unsigned>(s->length()));
- ASSERT(offset + length <= static_cast<unsigned>(s->length()));
- if (!length)
- return vm.smallStrings.emptyString();
- if (!offset && length == s->length())
- return s;
- return JSRopeString::createSubstringOfResolved(vm, s, offset, length);
-}
-
</del><span class="cx"> inline JSString* jsSubstring(ExecState* exec, JSString* s, unsigned offset, unsigned length)
</span><span class="cx"> {
</span><span class="cx"> return jsSubstring(exec->vm(), exec, s, offset, length);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeRegExpMatchesArraycpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp (198273 => 198274)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp 2016-03-16 15:13:51 UTC (rev 198273)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/RegExpMatchesArray.cpp 2016-03-16 15:14:03 UTC (rev 198274)
</span><span class="lines">@@ -76,13 +76,13 @@
</span><span class="cx"> if (UNLIKELY(globalObject->isHavingABadTime())) {
</span><span class="cx"> array = JSArray::tryCreateUninitialized(vm, globalObject->regExpMatchesArrayStructure(), regExp->numSubpatterns() + 1);
</span><span class="cx">
</span><del>- array->initializeIndex(vm, 0, jsSubstringOfResolved(vm, input, result.start, result.end - result.start));
</del><ins>+ array->initializeIndex(vm, 0, jsSubstring(vm, exec, input, result.start, result.end - result.start));
</ins><span class="cx">
</span><span class="cx"> if (unsigned numSubpatterns = regExp->numSubpatterns()) {
</span><span class="cx"> for (unsigned i = 1; i <= numSubpatterns; ++i) {
</span><span class="cx"> int start = subpatternResults[2 * i];
</span><span class="cx"> if (start >= 0)
</span><del>- array->initializeIndex(vm, i, JSRopeString::createSubstringOfResolved(vm, input, start, subpatternResults[2 * i + 1] - start));
</del><ins>+ array->initializeIndex(vm, i, jsSubstring(vm, exec, input, start, subpatternResults[2 * i + 1] - start));
</ins><span class="cx"> else
</span><span class="cx"> array->initializeIndex(vm, i, jsUndefined());
</span><span class="cx"> }
</span><span class="lines">@@ -91,13 +91,13 @@
</span><span class="cx"> array = tryCreateUninitializedRegExpMatchesArray(vm, globalObject->regExpMatchesArrayStructure(), regExp->numSubpatterns() + 1);
</span><span class="cx"> RELEASE_ASSERT(array);
</span><span class="cx">
</span><del>- array->initializeIndex(vm, 0, jsSubstringOfResolved(vm, input, result.start, result.end - result.start), ArrayWithContiguous);
</del><ins>+ array->initializeIndex(vm, 0, jsSubstring(vm, exec, input, result.start, result.end - result.start), ArrayWithContiguous);
</ins><span class="cx">
</span><span class="cx"> if (unsigned numSubpatterns = regExp->numSubpatterns()) {
</span><span class="cx"> for (unsigned i = 1; i <= numSubpatterns; ++i) {
</span><span class="cx"> int start = subpatternResults[2 * i];
</span><span class="cx"> if (start >= 0)
</span><del>- array->initializeIndex(vm, i, JSRopeString::createSubstringOfResolved(vm, input, start, subpatternResults[2 * i + 1] - start), ArrayWithContiguous);
</del><ins>+ array->initializeIndex(vm, i, jsSubstring(vm, exec, input, start, subpatternResults[2 * i + 1] - start), ArrayWithContiguous);
</ins><span class="cx"> else
</span><span class="cx"> array->initializeIndex(vm, i, jsUndefined(), ArrayWithContiguous);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>