<!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>[200743] 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/200743">200743</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-11 23:34:41 -0700 (Wed, 11 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[JSC] Make sure StringRange is passed to Vector by register
https://bugs.webkit.org/show_bug.cgi?id=157603
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-05-11
Reviewed by Darin Adler.
This is bizarre, but on my SDK, Vector::append(StringRange)
is passing the values on the stack.
The two integers are written to the stack, the address given
to append(), then append() reads it back and store it.
This patch changes the code to use constructAndAppend(), ensuring
the values are used directly.
On my machine, this helps Sunspider and Octane.
This might be something wrong with my SDK but the fix is so easy
that we might as well do this.
* runtime/StringPrototype.cpp:
(JSC::removeUsingRegExpSearch):
(JSC::replaceUsingRegExpSearch):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStringPrototypecpp">trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200742 => 200743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-12 06:23:19 UTC (rev 200742)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-12 06:34:41 UTC (rev 200743)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-05-11 Benjamin Poulain <bpoulain@apple.com>
+
+ [JSC] Make sure StringRange is passed to Vector by register
+ https://bugs.webkit.org/show_bug.cgi?id=157603
+
+ Reviewed by Darin Adler.
+
+ This is bizarre, but on my SDK, Vector::append(StringRange)
+ is passing the values on the stack.
+ The two integers are written to the stack, the address given
+ to append(), then append() reads it back and store it.
+
+ This patch changes the code to use constructAndAppend(), ensuring
+ the values are used directly.
+
+ On my machine, this helps Sunspider and Octane.
+ This might be something wrong with my SDK but the fix is so easy
+ that we might as well do this.
+
+ * runtime/StringPrototype.cpp:
+ (JSC::removeUsingRegExpSearch):
+ (JSC::replaceUsingRegExpSearch):
+
</ins><span class="cx"> 2016-05-11 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> ARMv7Assembler: suppress a -Wnarrowing warning when compiling with GCC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (200742 => 200743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-05-12 06:23:19 UTC (rev 200742)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-05-12 06:34:41 UTC (rev 200743)
</span><span class="lines">@@ -448,7 +448,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> if (lastIndex < result.start)
</span><del>- sourceRanges.append(StringRange(lastIndex, result.start - lastIndex));
</del><ins>+ sourceRanges.constructAndAppend(lastIndex, result.start - lastIndex);
</ins><span class="cx">
</span><span class="cx"> lastIndex = result.end;
</span><span class="cx"> startPosition = lastIndex;
</span><span class="lines">@@ -465,7 +465,7 @@
</span><span class="cx"> return JSValue::encode(string);
</span><span class="cx">
</span><span class="cx"> if (static_cast<unsigned>(lastIndex) < sourceLen)
</span><del>- sourceRanges.append(StringRange(lastIndex, sourceLen - lastIndex));
</del><ins>+ sourceRanges.constructAndAppend(lastIndex, sourceLen - lastIndex);
</ins><span class="cx">
</span><span class="cx"> return JSValue::encode(jsSpliceSubstrings(exec, string, source, sourceRanges.data(), sourceRanges.size()));
</span><span class="cx"> }
</span><span class="lines">@@ -517,7 +517,7 @@
</span><span class="cx"> if (!result)
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- sourceRanges.append(StringRange(lastIndex, result.start - lastIndex));
</del><ins>+ sourceRanges.constructAndAppend(lastIndex, result.start - lastIndex);
</ins><span class="cx">
</span><span class="cx"> unsigned i = 0;
</span><span class="cx"> for (; i < regExp->numSubpatterns() + 1; ++i) {
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx"> if (!result)
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- sourceRanges.append(StringRange(lastIndex, result.start - lastIndex));
</del><ins>+ sourceRanges.constructAndAppend(lastIndex, result.start - lastIndex);
</ins><span class="cx">
</span><span class="cx"> unsigned i = 0;
</span><span class="cx"> for (; i < regExp->numSubpatterns() + 1; ++i) {
</span><span class="lines">@@ -597,7 +597,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> if (callType != CallType::None) {
</span><del>- sourceRanges.append(StringRange(lastIndex, result.start - lastIndex));
</del><ins>+ sourceRanges.constructAndAppend(lastIndex, result.start - lastIndex);
</ins><span class="cx">
</span><span class="cx"> MarkedArgumentBuffer args;
</span><span class="cx">
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> int replLen = replacementString.length();
</span><span class="cx"> if (lastIndex < result.start || replLen) {
</span><del>- sourceRanges.append(StringRange(lastIndex, result.start - lastIndex));
</del><ins>+ sourceRanges.constructAndAppend(lastIndex, result.start - lastIndex);
</ins><span class="cx">
</span><span class="cx"> if (replLen)
</span><span class="cx"> replacements.append(substituteBackreferences(replacementString, source, ovector, regExp));
</span><span class="lines">@@ -645,7 +645,7 @@
</span><span class="cx"> return JSValue::encode(string);
</span><span class="cx">
</span><span class="cx"> if (static_cast<unsigned>(lastIndex) < sourceLen)
</span><del>- sourceRanges.append(StringRange(lastIndex, sourceLen - lastIndex));
</del><ins>+ sourceRanges.constructAndAppend(lastIndex, sourceLen - lastIndex);
</ins><span class="cx">
</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></pre>
</div>
</div>
</body>
</html>