<!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>[199780] 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/199780">199780</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-04-20 12:10:43 -0700 (Wed, 20 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unindent an unnecessary block in stringProtoFuncSplitFast().
https://bugs.webkit.org/show_bug.cgi?id=156802
Reviewed by Filip Pizlo.
In webkit.org/b/156013, I refactored stringProtoFuncSplit into
stringProtoFuncSplitFast. In that patch, I left an unnecessary block of code in
its original block (with FIXMEs) to keep the diff for that patch minimal. Now
that the patch for webkit.org/b/156013 has landed, I will unindent that block and
remove the FIXMEs.
* runtime/StringPrototype.cpp:
(JSC::stringProtoFuncSplitFast):</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 (199779 => 199780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-20 18:59:45 UTC (rev 199779)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-20 19:10:43 UTC (rev 199780)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-04-20 Mark Lam <mark.lam@apple.com>
+
+ Unindent an unnecessary block in stringProtoFuncSplitFast().
+ https://bugs.webkit.org/show_bug.cgi?id=156802
+
+ Reviewed by Filip Pizlo.
+
+ In webkit.org/b/156013, I refactored stringProtoFuncSplit into
+ stringProtoFuncSplitFast. In that patch, I left an unnecessary block of code in
+ its original block (with FIXMEs) to keep the diff for that patch minimal. Now
+ that the patch for webkit.org/b/156013 has landed, I will unindent that block and
+ remove the FIXMEs.
+
+ * runtime/StringPrototype.cpp:
+ (JSC::stringProtoFuncSplitFast):
+
</ins><span class="cx"> 2016-04-20 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB (Workers): Enable INDEXED_DATABASE_IN_WORKERS compile time flag, but disabled in RuntimeEnabledFeatures.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStringPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp (199779 => 199780)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-04-20 18:59:45 UTC (rev 199779)
+++ trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp 2016-04-20 19:10:43 UTC (rev 199780)
</span><span class="lines">@@ -1188,92 +1188,90 @@
</span><span class="cx"> // 9. If separator is a RegExp object (its [[Class]] is "RegExp"), let R = separator;
</span><span class="cx"> // otherwise let R = ToString(separator).
</span><span class="cx"> JSValue separatorValue = exec->uncheckedArgument(0);
</span><del>- { // FIXME: Keeping this indentation here to minimize the diff. Will unindent and remove this later.
- String separator = separatorValue.toString(exec)->value(exec);
- if (exec->hadException())
- return JSValue::encode(jsUndefined());
</del><ins>+ String separator = separatorValue.toString(exec)->value(exec);
+ if (exec->hadException())
+ return JSValue::encode(jsUndefined());
</ins><span class="cx">
</span><del>- // 10. If lim == 0, return A.
- if (!limit)
- return JSValue::encode(result);
</del><ins>+ // 10. If lim == 0, return A.
+ if (!limit)
+ return JSValue::encode(result);
</ins><span class="cx">
</span><del>- // 11. If separator is undefined, then
- if (separatorValue.isUndefined()) {
- // a. Call the [[DefineOwnProperty]] internal method of A with arguments "0",
</del><ins>+ // 11. If separator is undefined, then
+ if (separatorValue.isUndefined()) {
+ // a. Call the [[DefineOwnProperty]] internal method of A with arguments "0",
+ result->putDirectIndex(exec, 0, jsStringWithReuse(exec, thisValue, input));
+ // b. Return A.
+ return JSValue::encode(result);
+ }
+
+ // 12. If s == 0, then
+ if (input.isEmpty()) {
+ // a. Let z be SplitMatch(S, 0, R) where S is input, R is separator.
+ // b. If z is not false, return A.
+ // c. Call CreateDataProperty(A, "0", S).
+ // d. Return A.
+ if (!separator.isEmpty())
</ins><span class="cx"> result->putDirectIndex(exec, 0, jsStringWithReuse(exec, thisValue, input));
</span><del>- // b. Return A.
- return JSValue::encode(result);
- }
</del><ins>+ return JSValue::encode(result);
+ }
</ins><span class="cx">
</span><del>- // 12. If s == 0, then
- if (input.isEmpty()) {
- // a. Let z be SplitMatch(S, 0, R) where S is input, R is separator.
- // b. If z is not false, return A.
- // c. Call CreateDataProperty(A, "0", S).
- // d. Return A.
- if (!separator.isEmpty())
- result->putDirectIndex(exec, 0, jsStringWithReuse(exec, thisValue, input));
- return JSValue::encode(result);
- }
</del><ins>+ // Optimized case for splitting on the empty string.
+ if (separator.isEmpty()) {
+ limit = std::min(limit, input.length());
+ // Zero limt/input length handled in steps 9/11 respectively, above.
+ ASSERT(limit);
</ins><span class="cx">
</span><del>- // Optimized case for splitting on the empty string.
- if (separator.isEmpty()) {
- limit = std::min(limit, input.length());
- // Zero limt/input length handled in steps 9/11 respectively, above.
- ASSERT(limit);
</del><ins>+ do {
+ result->putDirectIndex(exec, position, jsSingleCharacterString(exec, input[position]));
+ } while (++position < limit);
</ins><span class="cx">
</span><del>- do {
- result->putDirectIndex(exec, position, jsSingleCharacterString(exec, input[position]));
- } while (++position < limit);
</del><ins>+ return JSValue::encode(result);
+ }
</ins><span class="cx">
</span><del>- return JSValue::encode(result);
- }
</del><ins>+ // 3 cases:
+ // -separator length == 1, 8 bits
+ // -separator length == 1, 16 bits
+ // -separator length > 1
+ StringImpl* stringImpl = input.impl();
+ StringImpl* separatorImpl = separator.impl();
+ size_t separatorLength = separatorImpl->length();
</ins><span class="cx">
</span><del>- // 3 cases:
- // -separator length == 1, 8 bits
- // -separator length == 1, 16 bits
- // -separator length > 1
- StringImpl* stringImpl = input.impl();
- StringImpl* separatorImpl = separator.impl();
- size_t separatorLength = separatorImpl->length();
</del><ins>+ if (separatorLength == 1) {
+ UChar separatorCharacter;
+ if (separatorImpl->is8Bit())
+ separatorCharacter = separatorImpl->characters8()[0];
+ else
+ separatorCharacter = separatorImpl->characters16()[0];
</ins><span class="cx">
</span><del>- if (separatorLength == 1) {
- UChar separatorCharacter;
- if (separatorImpl->is8Bit())
- separatorCharacter = separatorImpl->characters8()[0];
- else
- separatorCharacter = separatorImpl->characters16()[0];
-
- if (stringImpl->is8Bit()) {
- if (splitStringByOneCharacterImpl<LChar>(exec, result, thisValue, input, stringImpl, separatorCharacter, position, resultLength, limit))
- return JSValue::encode(result);
- } else {
- if (splitStringByOneCharacterImpl<UChar>(exec, result, thisValue, input, stringImpl, separatorCharacter, position, resultLength, limit))
- return JSValue::encode(result);
- }
</del><ins>+ if (stringImpl->is8Bit()) {
+ if (splitStringByOneCharacterImpl<LChar>(exec, result, thisValue, input, stringImpl, separatorCharacter, position, resultLength, limit))
+ return JSValue::encode(result);
</ins><span class="cx"> } else {
</span><del>- // 13. Let q = p.
- size_t matchPosition;
- // 14. Repeat, while q != s
- // a. let e be SplitMatch(S, q, R).
- // b. If e is failure, then let q = q+1.
- // c. Else, e is an integer index <= s.
- while ((matchPosition = stringImpl->find(separatorImpl, position)) != notFound) {
- // 1. Let T be a String value equal to the substring of S consisting of the characters at positions p (inclusive)
- // through q (exclusive).
- // 2. Call CreateDataProperty(A, ToString(lengthA), T).
- result->putDirectIndex(exec, resultLength, jsSubstring(exec, thisValue, input, position, matchPosition - position));
- // 3. Increment lengthA by 1.
- // 4. If lengthA == lim, return A.
- if (++resultLength == limit)
- return JSValue::encode(result);
</del><ins>+ if (splitStringByOneCharacterImpl<UChar>(exec, result, thisValue, input, stringImpl, separatorCharacter, position, resultLength, limit))
+ return JSValue::encode(result);
+ }
+ } else {
+ // 13. Let q = p.
+ size_t matchPosition;
+ // 14. Repeat, while q != s
+ // a. let e be SplitMatch(S, q, R).
+ // b. If e is failure, then let q = q+1.
+ // c. Else, e is an integer index <= s.
+ while ((matchPosition = stringImpl->find(separatorImpl, position)) != notFound) {
+ // 1. Let T be a String value equal to the substring of S consisting of the characters at positions p (inclusive)
+ // through q (exclusive).
+ // 2. Call CreateDataProperty(A, ToString(lengthA), T).
+ result->putDirectIndex(exec, resultLength, jsSubstring(exec, thisValue, input, position, matchPosition - position));
+ // 3. Increment lengthA by 1.
+ // 4. If lengthA == lim, return A.
+ if (++resultLength == limit)
+ return JSValue::encode(result);
</ins><span class="cx">
</span><del>- // 5. Let p = e.
- // 6. Let q = p.
- position = matchPosition + separator.length();
- }
</del><ins>+ // 5. Let p = e.
+ // 6. Let q = p.
+ position = matchPosition + separator.length();
</ins><span class="cx"> }
</span><del>- } // FIXME: Keeping this indentation here to minimize the diff. Will unindent and remove this later.
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // 15. Let T be a String value equal to the substring of S consisting of the characters at positions p (inclusive)
</span><span class="cx"> // through s (exclusive).
</span></span></pre>
</div>
</div>
</body>
</html>