<!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>[184926] 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/184926">184926</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-05-27 16:43:22 -0700 (Wed, 27 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: These sorting idioms used by Peacekeeper and Browsermark are ~20X slower
https://bugs.webkit.org/show_bug.cgi?id=145412
Reviewed by Benjamin Poulain.
Cache strings when doing a string-converting sort.
This is a 21% speedup.
* builtins/Array.prototype.js:
(sort.stringComparator): Use subtraction instead of branching because
it's slightly faster.
(sort.comparatorSort):
(sort.stringSort):
(sort): Add a special case for string sorting to avoid redundant string
conversion.
* parser/Parser.cpp:
(JSC::Parser<LexerType>::createBindingPattern): Names can be empty if
they are private names.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebuiltinsArrayprototypejs">trunk/Source/JavaScriptCore/builtins/Array.prototype.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserParsercpp">trunk/Source/JavaScriptCore/parser/Parser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (184925 => 184926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-27 23:21:58 UTC (rev 184925)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-27 23:43:22 UTC (rev 184926)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-05-27 Geoffrey Garen <ggaren@apple.com>
+
+ REGRESSION: These sorting idioms used by Peacekeeper and Browsermark are ~20X slower
+ https://bugs.webkit.org/show_bug.cgi?id=145412
+
+ Reviewed by Benjamin Poulain.
+
+ Cache strings when doing a string-converting sort.
+
+ This is a 21% speedup.
+
+ * builtins/Array.prototype.js:
+ (sort.stringComparator): Use subtraction instead of branching because
+ it's slightly faster.
+
+ (sort.comparatorSort):
+ (sort.stringSort):
+ (sort): Add a special case for string sorting to avoid redundant string
+ conversion.
+
+ * parser/Parser.cpp:
+ (JSC::Parser<LexerType>::createBindingPattern): Names can be empty if
+ they are private names.
+
</ins><span class="cx"> 2015-05-26 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> JIT-generated store barrier code should assume the buffer pointer and capacity to be compile-time constants
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebuiltinsArrayprototypejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/builtins/Array.prototype.js (184925 => 184926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/builtins/Array.prototype.js 2015-05-27 23:21:58 UTC (rev 184925)
+++ trunk/Source/JavaScriptCore/builtins/Array.prototype.js 2015-05-27 23:43:22 UTC (rev 184926)
</span><span class="lines">@@ -286,8 +286,8 @@
</span><span class="cx">
</span><span class="cx"> function stringComparator(a, b)
</span><span class="cx"> {
</span><del>- var aString = @toString(a);
- var bString = @toString(b);
</del><ins>+ var aString = a.string;
+ var bString = b.string;
</ins><span class="cx">
</span><span class="cx"> var aLength = aString.length;
</span><span class="cx"> var bLength = bString.length;
</span><span class="lines">@@ -300,19 +300,10 @@
</span><span class="cx"> if (aCharCode == bCharCode)
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (aCharCode < bCharCode)
- return -1;
-
- return 1;
</del><ins>+ return aCharCode - bCharCode;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (aLength == bLength)
- return 0;
-
- if (aLength < bLength)
- return -1;
-
- return 1;
</del><ins>+ return aLength - bLength;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Move undefineds and holes to the end of a sparse array. Result is [values..., undefineds..., holes...].
</span><span class="lines">@@ -440,6 +431,27 @@
</span><span class="cx"> mergeSort(array, valueCount, comparator);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function stringSort(array)
+ {
+ var length = array.length >>> 0;
+
+ // For compatibility with Firefox and Chrome, do nothing observable
+ // to the target array if it has 0 or 1 sortable properties.
+ if (length < 2)
+ return;
+
+ var valueCount = compact(array, length);
+
+ var strings = new @Array(valueCount);
+ for (var i = 0; i < valueCount; ++i)
+ strings[i] = { string: @toString(array[i]), value: array[i] };
+
+ mergeSort(strings, valueCount, stringComparator);
+
+ for (var i = 0; i < valueCount; ++i)
+ array[i] = strings[i].value;
+ }
+
</ins><span class="cx"> if (this === null)
</span><span class="cx"> throw new @TypeError("Array.prototype.sort requires that |this| not be null");
</span><span class="cx">
</span><span class="lines">@@ -449,11 +461,13 @@
</span><span class="cx"> if (typeof this == "string")
</span><span class="cx"> throw new @TypeError("Attempted to assign to readonly property.");
</span><span class="cx">
</span><del>- if (typeof comparator !== "function")
- comparator = stringComparator;
</del><ins>+ var array = @Object(this);
</ins><span class="cx">
</span><del>- var array = @Object(this);
- comparatorSort(array, comparator);
</del><ins>+ if (typeof comparator == "function")
+ comparatorSort(array, comparator);
+ else
+ stringSort(array);
+
</ins><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Parser.cpp (184925 => 184926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-05-27 23:21:58 UTC (rev 184925)
+++ trunk/Source/JavaScriptCore/parser/Parser.cpp 2015-05-27 23:43:22 UTC (rev 184926)
</span><span class="lines">@@ -534,7 +534,6 @@
</span><span class="cx"> template <typename LexerType>
</span><span class="cx"> template <class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::createBindingPattern(TreeBuilder& context, DeconstructionKind kind, const Identifier& name, int depth, JSToken token)
</span><span class="cx"> {
</span><del>- ASSERT(!name.isEmpty());
</del><span class="cx"> ASSERT(!name.isNull());
</span><span class="cx">
</span><span class="cx"> ASSERT(name.impl()->isAtomic() || name.impl()->isSymbol());
</span></span></pre>
</div>
</div>
</body>
</html>