<!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>[184575] 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/184575">184575</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-05-19 10:06:23 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Give JSString a StringView getter and start using it.
<https://webkit.org/b/145131>
Reviewed by Anders Carlsson.
When JSString is a substring internally, calling value(ExecState*) on it
will reify the baseString/start/length tuple into a new StringImpl.
For clients that only want to look at the characters of a JSString, but
don't actually need a reffable StringImpl, adding a light-weight StringView
getter lets them avoid constructing anything.
This patch adds JSString::view(ExecState*) and uses it in a few places.
There are many more opportunities to use this API, but let's do a few things
at a time.
* runtime/FunctionConstructor.cpp:
(JSC::constructFunctionSkippingEvalEnabledCheck):
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::decode):
(JSC::parseInt):
(JSC::jsToNumber):
(JSC::parseFloat):
(JSC::globalFuncParseInt):
(JSC::globalFuncParseFloat):
(JSC::globalFuncEscape):
(JSC::globalFuncUnescape):
* runtime/JSGlobalObjectFunctions.h:
* runtime/JSONObject.cpp:
(JSC::JSONProtoFuncParse):
* runtime/JSString.cpp:
(JSC::JSString::getPrimitiveNumber):
(JSC::JSString::toNumber):
* runtime/JSString.h:
(JSC::JSRopeString::view):
(JSC::JSString::view):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeFunctionConstructorcpp">trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionsh">trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSONObjectcpp">trunk/Source/JavaScriptCore/runtime/JSONObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringcpp">trunk/Source/JavaScriptCore/runtime/JSString.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringh">trunk/Source/JavaScriptCore/runtime/JSString.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (184574 => 184575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-19 16:46:52 UTC (rev 184574)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-19 17:06:23 UTC (rev 184575)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2015-05-19 Andreas Kling <akling@apple.com>
+
+ Give JSString a StringView getter and start using it.
+ <https://webkit.org/b/145131>
+
+ Reviewed by Anders Carlsson.
+
+ When JSString is a substring internally, calling value(ExecState*) on it
+ will reify the baseString/start/length tuple into a new StringImpl.
+
+ For clients that only want to look at the characters of a JSString, but
+ don't actually need a reffable StringImpl, adding a light-weight StringView
+ getter lets them avoid constructing anything.
+
+ This patch adds JSString::view(ExecState*) and uses it in a few places.
+ There are many more opportunities to use this API, but let's do a few things
+ at a time.
+
+ * runtime/FunctionConstructor.cpp:
+ (JSC::constructFunctionSkippingEvalEnabledCheck):
+ * runtime/JSGlobalObjectFunctions.cpp:
+ (JSC::decode):
+ (JSC::parseInt):
+ (JSC::jsToNumber):
+ (JSC::parseFloat):
+ (JSC::globalFuncParseInt):
+ (JSC::globalFuncParseFloat):
+ (JSC::globalFuncEscape):
+ (JSC::globalFuncUnescape):
+ * runtime/JSGlobalObjectFunctions.h:
+ * runtime/JSONObject.cpp:
+ (JSC::JSONProtoFuncParse):
+ * runtime/JSString.cpp:
+ (JSC::JSString::getPrimitiveNumber):
+ (JSC::JSString::toNumber):
+ * runtime/JSString.h:
+ (JSC::JSRopeString::view):
+ (JSC::JSString::view):
+
</ins><span class="cx"> 2015-05-18 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Better optimize 'if' with ternaries conditional tests.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeFunctionConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp (184574 => 184575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp 2015-05-19 16:46:52 UTC (rev 184574)
+++ trunk/Source/JavaScriptCore/runtime/FunctionConstructor.cpp 2015-05-19 17:06:23 UTC (rev 184575)
</span><span class="lines">@@ -103,13 +103,13 @@
</span><span class="cx"> builder.appendLiteral("{function ");
</span><span class="cx"> builder.append(functionName.string());
</span><span class="cx"> builder.append('(');
</span><del>- builder.append(args.at(0).toString(exec)->value(exec));
</del><ins>+ builder.append(args.at(0).toString(exec)->view(exec));
</ins><span class="cx"> for (size_t i = 1; i < args.size() - 1; i++) {
</span><span class="cx"> builder.appendLiteral(", ");
</span><del>- builder.append(args.at(i).toString(exec)->value(exec));
</del><ins>+ builder.append(args.at(i).toString(exec)->view(exec));
</ins><span class="cx"> }
</span><span class="cx"> builder.appendLiteral(") {\n");
</span><del>- builder.append(args.at(args.size() - 1).toString(exec)->value(exec));
</del><ins>+ builder.append(args.at(args.size() - 1).toString(exec)->view(exec));
</ins><span class="cx"> builder.appendLiteral("\n}}");
</span><span class="cx"> program = builder.toString();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (184574 => 184575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-05-19 16:46:52 UTC (rev 184574)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-05-19 17:06:23 UTC (rev 184575)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> static JSValue decode(ExecState* exec, const Bitmap<256>& doNotUnescape, bool strict)
</span><span class="cx"> {
</span><del>- String str = exec->argument(0).toString(exec)->value(exec);
</del><ins>+ StringView str = exec->argument(0).toString(exec)->view(exec);
</ins><span class="cx">
</span><span class="cx"> if (str.is8Bit())
</span><span class="cx"> return decode(exec, str.characters8(), str.length(), doNotUnescape, strict);
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> // ES5.1 15.1.2.2
</span><span class="cx"> template <typename CharType>
</span><span class="cx"> ALWAYS_INLINE
</span><del>-static double parseInt(const String& s, const CharType* data, int radix)
</del><ins>+static double parseInt(StringView s, const CharType* data, int radix)
</ins><span class="cx"> {
</span><span class="cx"> // 1. Let inputString be ToString(string).
</span><span class="cx"> // 2. Let S be a newly created substring of inputString consisting of the first character that is not a
</span><span class="lines">@@ -320,16 +320,16 @@
</span><span class="cx"> if (number >= mantissaOverflowLowerBound) {
</span><span class="cx"> if (radix == 10) {
</span><span class="cx"> size_t parsedLength;
</span><del>- number = parseDouble(StringView(s).substring(firstDigitPosition, p - firstDigitPosition), parsedLength);
</del><ins>+ number = parseDouble(s.substring(firstDigitPosition, p - firstDigitPosition), parsedLength);
</ins><span class="cx"> } else if (radix == 2 || radix == 4 || radix == 8 || radix == 16 || radix == 32)
</span><del>- number = parseIntOverflow(StringView(s).substring(firstDigitPosition, p - firstDigitPosition), radix);
</del><ins>+ number = parseIntOverflow(s.substring(firstDigitPosition, p - firstDigitPosition), radix);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 15. Return sign x number.
</span><span class="cx"> return sign * number;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static double parseInt(const String& s, int radix)
</del><ins>+static double parseInt(StringView s, int radix)
</ins><span class="cx"> {
</span><span class="cx"> if (s.is8Bit())
</span><span class="cx"> return parseInt(s, s.characters8(), radix);
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // See ecma-262 6th 11.8.3
</span><del>-double jsToNumber(const String& s)
</del><ins>+double jsToNumber(StringView s)
</ins><span class="cx"> {
</span><span class="cx"> unsigned size = s.length();
</span><span class="cx">
</span><span class="lines">@@ -517,7 +517,7 @@
</span><span class="cx"> return toDouble(s.characters16(), size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static double parseFloat(const String& s)
</del><ins>+static double parseFloat(StringView s)
</ins><span class="cx"> {
</span><span class="cx"> unsigned size = s.length();
</span><span class="cx">
</span><span class="lines">@@ -610,7 +610,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If ToString throws, we shouldn't call ToInt32.
</span><del>- String s = value.toString(exec)->value(exec);
</del><ins>+ StringView s = value.toString(exec)->view(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx">
</span><span class="lines">@@ -619,7 +619,7 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL globalFuncParseFloat(ExecState* exec)
</span><span class="cx"> {
</span><del>- return JSValue::encode(jsNumber(parseFloat(exec->argument(0).toString(exec)->value(exec))));
</del><ins>+ return JSValue::encode(jsNumber(parseFloat(exec->argument(0).toString(exec)->view(exec))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL globalFuncIsNaN(ExecState* exec)
</span><span class="lines">@@ -682,7 +682,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> JSStringBuilder builder;
</span><del>- String str = exec->argument(0).toString(exec)->value(exec);
</del><ins>+ StringView str = exec->argument(0).toString(exec)->view(exec);
</ins><span class="cx"> if (str.is8Bit()) {
</span><span class="cx"> const LChar* c = str.characters8();
</span><span class="cx"> for (unsigned k = 0; k < str.length(); k++, c++) {
</span><span class="lines">@@ -720,7 +720,7 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL globalFuncUnescape(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> StringBuilder builder;
</span><del>- String str = exec->argument(0).toString(exec)->value(exec);
</del><ins>+ StringView str = exec->argument(0).toString(exec)->view(exec);
</ins><span class="cx"> int k = 0;
</span><span class="cx"> int len = str.length();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h (184574 => 184575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h 2015-05-19 16:46:52 UTC (rev 184574)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.h 2015-05-19 17:06:23 UTC (rev 184575)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> static const double mantissaOverflowLowerBound = 9007199254740992.0;
</span><span class="cx"> double parseIntOverflow(const LChar*, unsigned length, int radix);
</span><span class="cx"> bool isStrWhiteSpace(UChar);
</span><del>-double jsToNumber(const WTF::String&);
</del><ins>+double jsToNumber(StringView);
</ins><span class="cx">
</span><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSONObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSONObject.cpp (184574 => 184575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSONObject.cpp 2015-05-19 16:46:52 UTC (rev 184574)
+++ trunk/Source/JavaScriptCore/runtime/JSONObject.cpp 2015-05-19 17:06:23 UTC (rev 184575)
</span><span class="lines">@@ -719,7 +719,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (!exec->argumentCount())
</span><span class="cx"> return throwVMError(exec, createError(exec, ASCIILiteral("JSON.parse requires at least one parameter")));
</span><del>- String source = exec->uncheckedArgument(0).toString(exec)->value(exec);
</del><ins>+ StringView source = exec->uncheckedArgument(0).toString(exec)->view(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSString.cpp (184574 => 184575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSString.cpp 2015-05-19 16:46:52 UTC (rev 184574)
+++ trunk/Source/JavaScriptCore/runtime/JSString.cpp 2015-05-19 17:06:23 UTC (rev 184575)
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> bool JSString::getPrimitiveNumber(ExecState* exec, double& number, JSValue& result) const
</span><span class="cx"> {
</span><span class="cx"> result = this;
</span><del>- number = jsToNumber(value(exec));
</del><ins>+ number = jsToNumber(view(exec));
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx">
</span><span class="cx"> double JSString::toNumber(ExecState* exec) const
</span><span class="cx"> {
</span><del>- return jsToNumber(value(exec));
</del><ins>+ return jsToNumber(view(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline StringObject* StringObject::create(VM& vm, JSGlobalObject* globalObject, JSString* string)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSString.h (184574 => 184575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSString.h 2015-05-19 16:46:52 UTC (rev 184574)
+++ trunk/Source/JavaScriptCore/runtime/JSString.h 2015-05-19 17:06:23 UTC (rev 184575)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "PropertySlot.h"
</span><span class="cx"> #include "Structure.h"
</span><span class="cx"> #include <array>
</span><ins>+#include <wtf/text/StringView.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -143,6 +144,7 @@
</span><span class="cx"> Identifier toIdentifier(ExecState*) const;
</span><span class="cx"> AtomicString toAtomicString(ExecState*) const;
</span><span class="cx"> AtomicStringImpl* toExistingAtomicString(ExecState*) const;
</span><ins>+ StringView view(ExecState*) const;
</ins><span class="cx"> const String& value(ExecState*) const;
</span><span class="cx"> const String& tryGetValue() const;
</span><span class="cx"> const StringImpl* tryGetValueImpl() const;
</span><span class="lines">@@ -369,6 +371,7 @@
</span><span class="cx"> void resolveRopeInternal16(UChar*) const;
</span><span class="cx"> void resolveRopeInternal16NoSubstring(UChar*) const;
</span><span class="cx"> void clearFibers() const;
</span><ins>+ StringView view(ExecState*) const;
</ins><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE JSString* getIndexSlowCase(ExecState*, unsigned);
</span><span class="cx">
</span><span class="lines">@@ -698,6 +701,24 @@
</span><span class="cx"> return inlineJSValueNotStringtoString(*this, exec);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ALWAYS_INLINE StringView JSRopeString::view(ExecState* exec) const
+{
+ if (isSubstring()) {
+ if (is8Bit())
+ return StringView(substringBase()->m_value.characters8() + substringOffset(), m_length);
+ return StringView(substringBase()->m_value.characters16() + substringOffset(), m_length);
+ }
+ resolveRope(exec);
+ return StringView(m_value);
+}
+
+ALWAYS_INLINE StringView JSString::view(ExecState* exec) const
+{
+ if (isRope())
+ return static_cast<const JSRopeString*>(this)->view(exec);
+ return StringView(m_value);
+}
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // JSString_h
</span></span></pre>
</div>
</div>
</body>
</html>