<!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>[176622] trunk/Source</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/176622">176622</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-12-01 18:21:16 -0800 (Mon, 01 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Optimize constructing JSC::Identifier from AtomicString.
<https://webkit.org/b/139157>
Reviewed by Michael Saboff.
Source/JavaScriptCore:
Add constructors for Identifier taking AtomicString and AtomicStringImpl.
This avoids branching on the string's isAtomic flag, which is obviously
always true for AtomicString & AtomicStringImpl.
Had to add a Identifier(const char*) constructor to resolve implicit
ambiguity between String / AtomicString.
Also made PrivateName::uid() return AtomicStringImpl* to take advantage
of the new constructor in a few places.
* runtime/Identifier.h:
(JSC::Identifier::Identifier):
* runtime/IdentifierInlines.h:
(JSC::Identifier::Identifier):
* runtime/PrivateName.h:
(JSC::PrivateName::uid):
Source/WTF:
Make AtomicString::isInAtomicStringTable() public so it can be used
in some Identifier assertions.
* wtf/text/AtomicString.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIdentifierh">trunk/Source/JavaScriptCore/runtime/Identifier.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIdentifierInlinesh">trunk/Source/JavaScriptCore/runtime/IdentifierInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePrivateNameh">trunk/Source/JavaScriptCore/runtime/PrivateName.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextAtomicStringh">trunk/Source/WTF/wtf/text/AtomicString.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (176621 => 176622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-12-02 02:16:55 UTC (rev 176621)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-12-02 02:21:16 UTC (rev 176622)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-12-01 Andreas Kling <akling@apple.com>
+
+ Optimize constructing JSC::Identifier from AtomicString.
+ <https://webkit.org/b/139157>
+
+ Reviewed by Michael Saboff.
+
+ Add constructors for Identifier taking AtomicString and AtomicStringImpl.
+ This avoids branching on the string's isAtomic flag, which is obviously
+ always true for AtomicString & AtomicStringImpl.
+
+ Had to add a Identifier(const char*) constructor to resolve implicit
+ ambiguity between String / AtomicString.
+
+ Also made PrivateName::uid() return AtomicStringImpl* to take advantage
+ of the new constructor in a few places.
+
+ * runtime/Identifier.h:
+ (JSC::Identifier::Identifier):
+ * runtime/IdentifierInlines.h:
+ (JSC::Identifier::Identifier):
+ * runtime/PrivateName.h:
+ (JSC::PrivateName::uid):
+
</ins><span class="cx"> 2014-12-01 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Several JavaScriptCore date tests are flaky, because they expect time to be frozen during execution
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Identifier.h (176621 => 176622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-12-02 02:16:55 UTC (rev 176621)
+++ trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-12-02 02:21:16 UTC (rev 176622)
</span><span class="lines">@@ -44,8 +44,11 @@
</span><span class="cx"> template<unsigned charactersCount>
</span><span class="cx"> Identifier(VM* vm, const char (&characters)[charactersCount]) : m_string(add(vm, characters)) { ASSERT(m_string.impl()->isAtomic()); }
</span><span class="cx">
</span><ins>+ Identifier(ExecState*, AtomicStringImpl*);
+ Identifier(ExecState*, const AtomicString&);
</ins><span class="cx"> Identifier(ExecState* exec, StringImpl* rep) : m_string(add(exec, rep)) { ASSERT(m_string.impl()->isAtomic()); }
</span><span class="cx"> Identifier(ExecState* exec, const String& s) : m_string(add(exec, s.impl())) { ASSERT(m_string.impl()->isAtomic()); }
</span><ins>+ Identifier(ExecState* exec, const char* s) : Identifier(exec, AtomicString(s)) { }
</ins><span class="cx">
</span><span class="cx"> Identifier(VM* vm, const LChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtomic()); }
</span><span class="cx"> Identifier(VM* vm, const UChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtomic()); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIdentifierInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IdentifierInlines.h (176621 => 176622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IdentifierInlines.h 2014-12-02 02:16:55 UTC (rev 176621)
+++ trunk/Source/JavaScriptCore/runtime/IdentifierInlines.h 2014-12-02 02:21:16 UTC (rev 176622)
</span><span class="lines">@@ -31,6 +31,30 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><ins>+inline Identifier::Identifier(ExecState* exec, AtomicStringImpl* string)
+ : m_string(string)
+{
+#ifndef NDEBUG
+ checkCurrentAtomicStringTable(exec);
+ if (string)
+ ASSERT_WITH_MESSAGE(!string->length() || AtomicString::isInAtomicStringTable(string), "The atomic string comes from an other thread!");
+#else
+ UNUSED_PARAM(exec);
+#endif
+}
+
+inline Identifier::Identifier(ExecState* exec, const AtomicString& string)
+ : m_string(string.string())
+{
+#ifndef NDEBUG
+ checkCurrentAtomicStringTable(exec);
+ if (!string.isNull())
+ ASSERT_WITH_MESSAGE(!string.length() || AtomicString::isInAtomicStringTable(string.impl()), "The atomic string comes from an other thread!");
+#else
+ UNUSED_PARAM(exec);
+#endif
+}
+
</ins><span class="cx"> inline PassRef<StringImpl> Identifier::add(ExecState* exec, StringImpl* r)
</span><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePrivateNameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PrivateName.h (176621 => 176622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PrivateName.h 2014-12-02 02:16:55 UTC (rev 176621)
+++ trunk/Source/JavaScriptCore/runtime/PrivateName.h 2014-12-02 02:21:16 UTC (rev 176622)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> ASSERT(m_impl->isEmptyUnique());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- StringImpl* uid() const { return m_impl.get(); }
</del><ins>+ AtomicStringImpl* uid() const { return static_cast<AtomicStringImpl*>(m_impl.get()); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> RefPtr<StringImpl> m_impl;
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (176621 => 176622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-12-02 02:16:55 UTC (rev 176621)
+++ trunk/Source/WTF/ChangeLog 2014-12-02 02:21:16 UTC (rev 176622)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-12-01 Andreas Kling <akling@apple.com>
+
+ Optimize constructing JSC::Identifier from AtomicString.
+ <https://webkit.org/b/139157>
+
+ Reviewed by Michael Saboff.
+
+ Make AtomicString::isInAtomicStringTable() public so it can be used
+ in some Identifier assertions.
+
+ * wtf/text/AtomicString.h:
+
</ins><span class="cx"> 2014-12-01 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix non-mac builds.
</span></span></pre></div>
<a id="trunkSourceWTFwtftextAtomicStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/AtomicString.h (176621 => 176622)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/AtomicString.h 2014-12-02 02:16:55 UTC (rev 176621)
+++ trunk/Source/WTF/wtf/text/AtomicString.h 2014-12-02 02:21:16 UTC (rev 176622)
</span><span class="lines">@@ -204,6 +204,10 @@
</span><span class="cx"> return addSlowCase(*stringTableProvider.atomicStringTable(), *string);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !ASSERT_DISABLED
+ WTF_EXPORT_STRING_API static bool isInAtomicStringTable(StringImpl*);
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> // The explicit constructors with AtomicString::ConstructFromLiteral must be used for literals.
</span><span class="cx"> AtomicString(ASCIILiteral);
</span><span class="lines">@@ -215,10 +219,6 @@
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_STRING_API static AtomicStringImpl* findSlowCase(StringImpl&);
</span><span class="cx"> WTF_EXPORT_STRING_API static AtomicString fromUTF8Internal(const char*, const char*);
</span><del>-
-#if !ASSERT_DISABLED
- WTF_EXPORT_STRING_API static bool isInAtomicStringTable(StringImpl*);
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline bool operator==(const AtomicString& a, const AtomicString& b) { return a.impl() == b.impl(); }
</span></span></pre>
</div>
</div>
</body>
</html>