<!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>[197739] releases/WebKitGTK/webkit-2.12</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/197739">197739</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-08 00:38:40 -0800 (Tue, 08 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/197416">r197416</a> - FTL should simplify StringReplace with an empty replacement string
https://bugs.webkit.org/show_bug.cgi?id=154871
Reviewed by Michael Saboff.
This is a simple and hugely profitable change. If we do a string.replace(/things/, ""), then
this calls directly into StringPrototype's replace-with-empty-string logic instead of going
through stuff that does checks before reaching that same conclusion.
This speeds up Octane/regexp by about 6-10%. It also speeds up the attached microbenchmark by
about 7%.
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileStringReplace):
* runtime/StringPrototype.cpp:
(JSC::jsSpliceSubstringsWithSeparators):
(JSC::removeUsingRegExpSearch):
(JSC::replaceUsingRegExpSearch):
(JSC::operationStringProtoFuncReplaceRegExpEmptyStr):
(JSC::operationStringProtoFuncReplaceRegExpString):
* runtime/StringPrototype.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsjsregressscripttestsstringreplacejs">releases/WebKitGTK/webkit-2.12/LayoutTests/js/regress/script-tests/string-replace.js</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreftlFTLLowerDFGToB3cpp">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeStringPrototypecpp">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeStringPrototypeh">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/StringPrototype.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsjsregressscripttestsstringreplacejs"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/js/regress/script-tests/string-replace.js (197738 => 197739)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/js/regress/script-tests/string-replace.js 2016-03-08 08:20:22 UTC (rev 197738)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/js/regress/script-tests/string-replace.js 2016-03-08 08:38:40 UTC (rev 197739)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> (function() {
</span><span class="cx"> var result;
</span><span class="cx"> for (var i = 0; i < 400000; ++i) {
</span><del>- result = "foo".replace(/f/, "b");
</del><ins>+ result = "foo".replace(/f/g, "b");
</ins><span class="cx"> }
</span><span class="cx"> if (result != "boo")
</span><span class="cx"> throw "Error: bad result: "+ result;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog (197738 => 197739)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-03-08 08:20:22 UTC (rev 197738)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-03-08 08:38:40 UTC (rev 197739)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-03-01 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ FTL should simplify StringReplace with an empty replacement string
+ https://bugs.webkit.org/show_bug.cgi?id=154871
+
+ Reviewed by Michael Saboff.
+
+ This is a simple and hugely profitable change. If we do a string.replace(/things/, ""), then
+ this calls directly into StringPrototype's replace-with-empty-string logic instead of going
+ through stuff that does checks before reaching that same conclusion.
+
+ This speeds up Octane/regexp by about 6-10%. It also speeds up the attached microbenchmark by
+ about 7%.
+
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileStringReplace):
+ * runtime/StringPrototype.cpp:
+ (JSC::jsSpliceSubstringsWithSeparators):
+ (JSC::removeUsingRegExpSearch):
+ (JSC::replaceUsingRegExpSearch):
+ (JSC::operationStringProtoFuncReplaceRegExpEmptyStr):
+ (JSC::operationStringProtoFuncReplaceRegExpString):
+ * runtime/StringPrototype.h:
+
+2016-03-01 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Unreviewed, fix CLOOP build.
</span><span class="cx">
</span><span class="cx"> * jit/JITOperations.h:
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreftlFTLLowerDFGToB3cpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp (197738 => 197739)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-03-08 08:20:22 UTC (rev 197738)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp 2016-03-08 08:38:40 UTC (rev 197739)
</span><span class="lines">@@ -6467,6 +6467,21 @@
</span><span class="cx"> if (m_node->child1().useKind() == StringUse
</span><span class="cx"> && m_node->child2().useKind() == RegExpObjectUse
</span><span class="cx"> && m_node->child3().useKind() == StringUse) {
</span><ins>+
+ if (JSString* replace = m_node->child3()->dynamicCastConstant<JSString*>()) {
+ if (!replace->length()) {
+ LValue string = lowString(m_node->child1());
+ LValue regExp = lowCell(m_node->child2());
+ speculateRegExpObject(m_node->child2(), regExp);
+
+ LValue result = vmCall(
+ Int64, m_out.operation(operationStringProtoFuncReplaceRegExpEmptyStr),
+ m_callFrame, string, regExp);
+
+ setJSValue(result);
+ return;
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> LValue string = lowString(m_node->child1());
</span><span class="cx"> LValue regExp = lowCell(m_node->child2());
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/StringPrototype.cpp (197738 => 197739)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-03-08 08:20:22 UTC (rev 197738)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-03-08 08:38:40 UTC (rev 197739)
</span><span class="lines">@@ -446,7 +446,7 @@
</span><span class="cx"> return jsString(exec, impl.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NEVER_INLINE EncodedJSValue removeUsingRegExpSearch(ExecState* exec, JSString* string, const String& source, RegExp* regExp)
</del><ins>+static ALWAYS_INLINE EncodedJSValue removeUsingRegExpSearch(ExecState* exec, JSString* string, const String& source, RegExp* regExp)
</ins><span class="cx"> {
</span><span class="cx"> size_t lastIndex = 0;
</span><span class="cx"> unsigned startPosition = 0;
</span><span class="lines">@@ -506,6 +506,8 @@
</span><span class="cx"> return removeUsingRegExpSearch(exec, string, source, regExp);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // FIXME: This is wrong because we may be called directly from the FTL.
+ // https://bugs.webkit.org/show_bug.cgi?id=154874
</ins><span class="cx"> RegExpConstructor* regExpConstructor = exec->lexicalGlobalObject()->regExpConstructor();
</span><span class="cx">
</span><span class="cx"> size_t lastIndex = 0;
</span><span class="lines">@@ -664,6 +666,24 @@
</span><span class="cx"> return JSValue::encode(jsSpliceSubstringsWithSeparators(exec, string, source, sourceRanges.data(), sourceRanges.size(), replacements.data(), replacements.size()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+EncodedJSValue JIT_OPERATION operationStringProtoFuncReplaceRegExpEmptyStr(
+ ExecState* exec, JSString* thisValue, RegExpObject* searchValue)
+{
+ RegExp* regExp = searchValue->regExp();
+ if (regExp->global()) {
+ // ES5.1 15.5.4.10 step 8.a.
+ searchValue->setLastIndex(exec, 0);
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
+ return removeUsingRegExpSearch(exec, thisValue, thisValue->value(exec), regExp);
+ }
+
+ CallData callData;
+ String replacementString = emptyString();
+ return replaceUsingRegExpSearch(
+ exec, thisValue, searchValue, callData, CallTypeNone, replacementString, JSValue());
+}
+
</ins><span class="cx"> EncodedJSValue JIT_OPERATION operationStringProtoFuncReplaceRegExpString(
</span><span class="cx"> ExecState* exec, JSString* thisValue, RegExpObject* searchValue, JSString* replaceString)
</span><span class="cx"> {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeStringPrototypeh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/StringPrototype.h (197738 => 197739)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/StringPrototype.h 2016-03-08 08:20:22 UTC (rev 197738)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/StringPrototype.h 2016-03-08 08:38:40 UTC (rev 197739)
</span><span class="lines">@@ -54,11 +54,13 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JIT_OPERATION operationStringProtoFuncReplaceGeneric(
</span><del>- ExecState* exec, EncodedJSValue thisValue, EncodedJSValue searchValue,
- EncodedJSValue replaceValue);
</del><ins>+ ExecState*, EncodedJSValue thisValue, EncodedJSValue searchValue, EncodedJSValue replaceValue);
</ins><span class="cx">
</span><ins>+EncodedJSValue JIT_OPERATION operationStringProtoFuncReplaceRegExpEmptyStr(
+ ExecState*, JSString* thisValue, RegExpObject* searchValue);
+
</ins><span class="cx"> EncodedJSValue JIT_OPERATION operationStringProtoFuncReplaceRegExpString(
</span><del>- ExecState* exec, JSString* thisValue, RegExpObject* searchValue, JSString* replaceValue);
</del><ins>+ ExecState*, JSString* thisValue, RegExpObject* searchValue, JSString* replaceValue);
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>