<!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>[173082] 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/173082">173082</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-08-28 14:38:18 -0700 (Thu, 28 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use JSString::toIdentifier() in more places.
<https://webkit.org/b/136348>
Call sites that grab the WTF::String from a JSString using value() can
use the more efficient toIdentifier() if the string is going to be used
to construct an Identifier.
If the JSString is a rope that resolves to something that is already
present in the VM's Identifier table, using toIdentifier() can avoid
allocating a new StringImpl.
Reviewed by Geoffrey Garen.
* jit/JITOperations.cpp:
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
* runtime/CommonSlowPaths.cpp:
(JSC::SLOW_PATH_DECL):
* runtime/CommonSlowPaths.h:
(JSC::CommonSlowPaths::opIn):
* runtime/JSONObject.cpp:
(JSC::Stringifier::Stringifier):
* runtime/ObjectConstructor.cpp:
(JSC::objectConstructorGetOwnPropertyDescriptor):
(JSC::objectConstructorDefineProperty):
* runtime/ObjectPrototype.cpp:
(JSC::objectProtoFuncPropertyIsEnumerable):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITOperationscpp">trunk/Source/JavaScriptCore/jit/JITOperations.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp">trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonSlowPathsh">trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSONObjectcpp">trunk/Source/JavaScriptCore/runtime/JSONObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectConstructorcpp">trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectPrototypecpp">trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173081 => 173082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-28 21:36:25 UTC (rev 173081)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-28 21:38:18 UTC (rev 173082)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-08-28 Andreas Kling <akling@apple.com>
+
+ Use JSString::toIdentifier() in more places.
+ <https://webkit.org/b/136348>
+
+ Call sites that grab the WTF::String from a JSString using value() can
+ use the more efficient toIdentifier() if the string is going to be used
+ to construct an Identifier.
+
+ If the JSString is a rope that resolves to something that is already
+ present in the VM's Identifier table, using toIdentifier() can avoid
+ allocating a new StringImpl.
+
+ Reviewed by Geoffrey Garen.
+
+ * jit/JITOperations.cpp:
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ * runtime/CommonSlowPaths.cpp:
+ (JSC::SLOW_PATH_DECL):
+ * runtime/CommonSlowPaths.h:
+ (JSC::CommonSlowPaths::opIn):
+ * runtime/JSONObject.cpp:
+ (JSC::Stringifier::Stringifier):
+ * runtime/ObjectConstructor.cpp:
+ (JSC::objectConstructorGetOwnPropertyDescriptor):
+ (JSC::objectConstructorDefineProperty):
+ * runtime/ObjectPrototype.cpp:
+ (JSC::objectProtoFuncPropertyIsEnumerable):
+
</ins><span class="cx"> 2014-08-27 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG should compute immediate dominators using the O(n log n) form of Lengauer and Tarjan's "A Fast Algorithm for Finding Dominators in a Flowgraph"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITOperations.cpp (173081 => 173082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2014-08-28 21:36:25 UTC (rev 173081)
+++ trunk/Source/JavaScriptCore/jit/JITOperations.cpp 2014-08-28 21:38:18 UTC (rev 173082)
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx"> PutPropertySlot slot(baseObject, callFrame->codeBlock()->isStrictMode());
</span><span class="cx"> baseObject->putDirect(callFrame->vm(), jsCast<NameInstance*>(subscript.asCell())->privateName(), value, slot);
</span><span class="cx"> } else {
</span><del>- Identifier property(callFrame, subscript.toString(callFrame)->value(callFrame));
</del><ins>+ Identifier property = subscript.toString(callFrame)->toIdentifier(callFrame);
</ins><span class="cx"> if (!callFrame->vm().exception()) { // Don't put to an object if toString threw an exception.
</span><span class="cx"> PutPropertySlot slot(baseObject, callFrame->codeBlock()->isStrictMode());
</span><span class="cx"> baseObject->putDirect(callFrame->vm(), property, value, slot);
</span><span class="lines">@@ -920,7 +920,7 @@
</span><span class="cx">
</span><span class="cx"> size_t JIT_OPERATION operationHasProperty(ExecState* exec, JSObject* base, JSString* property)
</span><span class="cx"> {
</span><del>- int result = base->hasProperty(exec, Identifier(exec, property->value(exec)));
</del><ins>+ int result = base->hasProperty(exec, property->toIdentifier(exec));
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (173081 => 173082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-08-28 21:36:25 UTC (rev 173081)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-08-28 21:38:18 UTC (rev 173082)
</span><span class="lines">@@ -793,7 +793,7 @@
</span><span class="cx"> LLINT_END();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Identifier property(exec, subscript.toString(exec)->value(exec));
</del><ins>+ Identifier property = subscript.toString(exec)->toIdentifier(exec);
</ins><span class="cx"> LLINT_CHECK_EXCEPTION();
</span><span class="cx"> PutPropertySlot slot(baseValue, exec->codeBlock()->isStrictMode());
</span><span class="cx"> baseValue.put(exec, property, value, slot);
</span><span class="lines">@@ -816,7 +816,7 @@
</span><span class="cx"> PutPropertySlot slot(baseObject, exec->codeBlock()->isStrictMode());
</span><span class="cx"> baseObject->putDirect(exec->vm(), jsCast<NameInstance*>(subscript.asCell())->privateName(), value, slot);
</span><span class="cx"> } else {
</span><del>- Identifier property(exec, subscript.toString(exec)->value(exec));
</del><ins>+ Identifier property = subscript.toString(exec)->toIdentifier(exec);
</ins><span class="cx"> if (!exec->vm().exception()) { // Don't put to an object if toString threw an exception.
</span><span class="cx"> PutPropertySlot slot(baseObject, exec->codeBlock()->isStrictMode());
</span><span class="cx"> baseObject->putDirect(exec->vm(), property, value, slot);
</span><span class="lines">@@ -842,7 +842,7 @@
</span><span class="cx"> couldDelete = baseObject->methodTable()->deleteProperty(baseObject, exec, jsCast<NameInstance*>(subscript.asCell())->privateName());
</span><span class="cx"> else {
</span><span class="cx"> LLINT_CHECK_EXCEPTION();
</span><del>- Identifier property(exec, subscript.toString(exec)->value(exec));
</del><ins>+ Identifier property = subscript.toString(exec)->toIdentifier(exec);
</ins><span class="cx"> LLINT_CHECK_EXCEPTION();
</span><span class="cx"> couldDelete = baseObject->methodTable()->deleteProperty(baseObject, exec, property);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp (173081 => 173082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2014-08-28 21:36:25 UTC (rev 173081)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp 2014-08-28 21:38:18 UTC (rev 173082)
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx"> couldDelete = baseObject->methodTable()->deleteProperty(baseObject, exec, jsCast<NameInstance*>(subscript.asCell())->privateName());
</span><span class="cx"> else {
</span><span class="cx"> CHECK_EXCEPTION();
</span><del>- Identifier property(exec, subscript.toString(exec)->value(exec));
</del><ins>+ Identifier property = subscript.toString(exec)->toIdentifier(exec);
</ins><span class="cx"> CHECK_EXCEPTION();
</span><span class="cx"> couldDelete = baseObject->methodTable()->deleteProperty(baseObject, exec, property);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonSlowPathsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h (173081 => 173082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2014-08-28 21:36:25 UTC (rev 173081)
+++ trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h 2014-08-28 21:38:18 UTC (rev 173082)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> if (isName(propName))
</span><span class="cx"> return baseObj->hasProperty(exec, jsCast<NameInstance*>(propName.asCell())->privateName());
</span><span class="cx">
</span><del>- Identifier property(exec, propName.toString(exec)->value(exec));
</del><ins>+ Identifier property = propName.toString(exec)->toIdentifier(exec);
</ins><span class="cx"> if (exec->vm().exception())
</span><span class="cx"> return false;
</span><span class="cx"> return baseObj->hasProperty(exec, property);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSONObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSONObject.cpp (173081 => 173082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSONObject.cpp 2014-08-28 21:36:25 UTC (rev 173081)
+++ trunk/Source/JavaScriptCore/runtime/JSONObject.cpp 2014-08-28 21:38:18 UTC (rev 173082)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_arrayReplacerPropertyNames.add(Identifier(exec, name.toString(exec)->value(exec)));
</del><ins>+ m_arrayReplacerPropertyNames.add(name.toString(exec)->toIdentifier(exec));
</ins><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp (173081 => 173082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2014-08-28 21:36:25 UTC (rev 173081)
+++ trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp 2014-08-28 21:38:18 UTC (rev 173082)
</span><span class="lines">@@ -173,12 +173,12 @@
</span><span class="cx"> {
</span><span class="cx"> if (!exec->argument(0).isObject())
</span><span class="cx"> return throwVMError(exec, createTypeError(exec, ASCIILiteral("Requested property descriptor of a value that is not an object.")));
</span><del>- String propertyName = exec->argument(1).toString(exec)->value(exec);
</del><ins>+ Identifier propertyName = exec->argument(1).toString(exec)->toIdentifier(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> JSObject* object = asObject(exec->argument(0));
</span><span class="cx"> PropertyDescriptor descriptor;
</span><del>- if (!object->getOwnPropertyDescriptor(exec, Identifier(exec, propertyName), descriptor))
</del><ins>+ if (!object->getOwnPropertyDescriptor(exec, propertyName, descriptor))
</ins><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsUndefined());
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> if (!exec->argument(0).isObject())
</span><span class="cx"> return throwVMError(exec, createTypeError(exec, ASCIILiteral("Properties can only be defined on Objects.")));
</span><span class="cx"> JSObject* O = asObject(exec->argument(0));
</span><del>- String propertyName = exec->argument(1).toString(exec)->value(exec);
</del><ins>+ Identifier propertyName = exec->argument(1).toString(exec)->toIdentifier(exec);
</ins><span class="cx"> if (exec->hadException())
</span><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> return JSValue::encode(jsNull());
</span><span class="cx"> ASSERT((descriptor.attributes() & Accessor) || (!descriptor.isAccessorDescriptor()));
</span><span class="cx"> ASSERT(!exec->hadException());
</span><del>- O->methodTable(exec->vm())->defineOwnProperty(O, exec, Identifier(exec, propertyName), descriptor, true);
</del><ins>+ O->methodTable(exec->vm())->defineOwnProperty(O, exec, propertyName, descriptor, true);
</ins><span class="cx"> return JSValue::encode(O);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp (173081 => 173082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2014-08-28 21:36:25 UTC (rev 173081)
+++ trunk/Source/JavaScriptCore/runtime/ObjectPrototype.cpp 2014-08-28 21:38:18 UTC (rev 173082)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL objectProtoFuncPropertyIsEnumerable(ExecState* exec)
</span><span class="cx"> {
</span><span class="cx"> JSObject* thisObject = exec->thisValue().toThis(exec, StrictMode).toObject(exec);
</span><del>- Identifier propertyName(exec, exec->argument(0).toString(exec)->value(exec));
</del><ins>+ Identifier propertyName = exec->argument(0).toString(exec)->toIdentifier(exec);
</ins><span class="cx">
</span><span class="cx"> PropertyDescriptor descriptor;
</span><span class="cx"> bool enumerable = thisObject->getOwnPropertyDescriptor(exec, propertyName, descriptor) && descriptor.enumerable();
</span></span></pre>
</div>
</div>
</body>
</html>