<!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>[163808] 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/163808">163808</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 12:39:12 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the Identifier::add() family return PassRef<StringImpl>.
<https://webkit.org/b/128542>
This knocks one branch off of creating an Identifier from another
string source.
Reviewed by Oliver Hunt.
* runtime/Identifier.cpp:
(JSC::Identifier::add):
(JSC::Identifier::add8):
(JSC::Identifier::addSlowCase):
* runtime/Identifier.h:
(JSC::Identifier::add):
* runtime/Lookup.cpp:
(JSC::HashTable::createTable):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIdentifiercpp">trunk/Source/JavaScriptCore/runtime/Identifier.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIdentifierh">trunk/Source/JavaScriptCore/runtime/Identifier.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeLookupcpp">trunk/Source/JavaScriptCore/runtime/Lookup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163807 => 163808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-02-10 20:07:34 UTC (rev 163807)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-02-10 20:39:12 UTC (rev 163808)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-10 Andreas Kling <akling@apple.com>
+
+ Make the Identifier::add() family return PassRef<StringImpl>.
+ <https://webkit.org/b/128542>
+
+ This knocks one branch off of creating an Identifier from another
+ string source.
+
+ Reviewed by Oliver Hunt.
+
+ * runtime/Identifier.cpp:
+ (JSC::Identifier::add):
+ (JSC::Identifier::add8):
+ (JSC::Identifier::addSlowCase):
+ * runtime/Identifier.h:
+ (JSC::Identifier::add):
+ * runtime/Lookup.cpp:
+ (JSC::HashTable::createTable):
+
</ins><span class="cx"> 2014-02-09 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove unnecessary spinLock in JSLock.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIdentifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Identifier.cpp (163807 => 163808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Identifier.cpp 2014-02-10 20:07:34 UTC (rev 163807)
+++ trunk/Source/JavaScriptCore/runtime/Identifier.cpp 2014-02-10 20:39:12 UTC (rev 163808)
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-PassRefPtr<StringImpl> Identifier::add(VM* vm, const char* c)
</del><ins>+PassRef<StringImpl> Identifier::add(VM* vm, const char* c)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(c);
</span><span class="cx"> ASSERT(c[0]);
</span><span class="lines">@@ -103,15 +103,15 @@
</span><span class="cx"> // The boolean in the pair tells us if that is so.
</span><span class="cx"> RefPtr<StringImpl> addedString = addResult.isNewEntry ? adoptRef(*addResult.iterator) : *addResult.iterator;
</span><span class="cx">
</span><del>- return addedString.release();
</del><ins>+ return addedString.releaseNonNull();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<StringImpl> Identifier::add(ExecState* exec, const char* c)
</del><ins>+PassRef<StringImpl> Identifier::add(ExecState* exec, const char* c)
</ins><span class="cx"> {
</span><span class="cx"> return add(&exec->vm(), c);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<StringImpl> Identifier::add8(VM* vm, const UChar* s, int length)
</del><ins>+PassRef<StringImpl> Identifier::add8(VM* vm, const UChar* s, int length)
</ins><span class="cx"> {
</span><span class="cx"> if (length == 1) {
</span><span class="cx"> UChar c = s[0];
</span><span class="lines">@@ -121,19 +121,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!length)
</span><del>- return StringImpl::empty();
</del><ins>+ return *StringImpl::empty();
</ins><span class="cx"> CharBuffer<UChar> buf = { s, static_cast<unsigned>(length) };
</span><span class="cx"> HashSet<StringImpl*>::AddResult addResult = vm->identifierTable->add<CharBuffer<UChar>, IdentifierLCharFromUCharTranslator >(buf);
</span><span class="cx">
</span><span class="cx"> // If the string is newly-translated, then we need to adopt it.
</span><span class="cx"> // The boolean in the pair tells us if that is so.
</span><del>- return addResult.isNewEntry ? adoptRef(*addResult.iterator) : *addResult.iterator;
</del><ins>+ return addResult.isNewEntry ? adoptRef(**addResult.iterator) : **addResult.iterator;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<StringImpl> Identifier::addSlowCase(VM* vm, StringImpl* r)
</del><ins>+PassRef<StringImpl> Identifier::addSlowCase(VM* vm, StringImpl* r)
</ins><span class="cx"> {
</span><span class="cx"> if (r->isEmptyUnique())
</span><del>- return r;
</del><ins>+ return *r;
</ins><span class="cx"> ASSERT(!r->isIdentifier());
</span><span class="cx"> // The empty & null strings are static singletons, and static strings are handled
</span><span class="cx"> // in ::add() in the header, so we should never get here with a zero length string.
</span><span class="lines">@@ -144,13 +144,13 @@
</span><span class="cx"> if (c <= maxSingleCharacterString)
</span><span class="cx"> r = vm->smallStrings.singleCharacterStringRep(c);
</span><span class="cx"> if (r->isIdentifier())
</span><del>- return r;
</del><ins>+ return *r;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return *vm->identifierTable->add(r).iterator;
</del><ins>+ return **vm->identifierTable->add(r).iterator;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<StringImpl> Identifier::addSlowCase(ExecState* exec, StringImpl* r)
</del><ins>+PassRef<StringImpl> Identifier::addSlowCase(ExecState* exec, StringImpl* r)
</ins><span class="cx"> {
</span><span class="cx"> return addSlowCase(&exec->vm(), r);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIdentifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Identifier.h (163807 => 163808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-02-10 20:07:34 UTC (rev 163807)
+++ trunk/Source/JavaScriptCore/runtime/Identifier.h 2014-02-10 20:39:12 UTC (rev 163808)
</span><span class="lines">@@ -95,8 +95,8 @@
</span><span class="cx"> static bool equal(const StringImpl* a, const StringImpl* b) { return ::equal(a, b); }
</span><span class="cx">
</span><span class="cx"> // Only to be used with string literals.
</span><del>- static PassRefPtr<StringImpl> add(VM*, const char*);
- JS_EXPORT_PRIVATE static PassRefPtr<StringImpl> add(ExecState*, const char*);
</del><ins>+ static PassRef<StringImpl> add(VM*, const char*);
+ JS_EXPORT_PRIVATE static PassRef<StringImpl> add(ExecState*, const char*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> String m_string;
</span><span class="lines">@@ -107,31 +107,31 @@
</span><span class="cx"> static bool equal(const Identifier& a, const Identifier& b) { return a.m_string.impl() == b.m_string.impl(); }
</span><span class="cx"> static bool equal(const Identifier& a, const LChar* b) { return equal(a.m_string.impl(), b); }
</span><span class="cx">
</span><del>- template <typename T> static PassRefPtr<StringImpl> add(VM*, const T*, int length);
- static PassRefPtr<StringImpl> add8(VM*, const UChar*, int length);
</del><ins>+ template <typename T> static PassRef<StringImpl> add(VM*, const T*, int length);
+ static PassRef<StringImpl> add8(VM*, const UChar*, int length);
</ins><span class="cx"> template <typename T> ALWAYS_INLINE static bool canUseSingleCharacterString(T);
</span><span class="cx">
</span><del>- static PassRefPtr<StringImpl> add(ExecState* exec, StringImpl* r)
</del><ins>+ static PassRef<StringImpl> add(ExecState* exec, StringImpl* r)
</ins><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> checkCurrentIdentifierTable(exec);
</span><span class="cx"> #endif
</span><span class="cx"> if (r->isIdentifier())
</span><del>- return r;
</del><ins>+ return *r;
</ins><span class="cx"> return addSlowCase(exec, r);
</span><span class="cx"> }
</span><del>- static PassRefPtr<StringImpl> add(VM* vm, StringImpl* r)
</del><ins>+ static PassRef<StringImpl> add(VM* vm, StringImpl* r)
</ins><span class="cx"> {
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> checkCurrentIdentifierTable(vm);
</span><span class="cx"> #endif
</span><span class="cx"> if (r->isIdentifier())
</span><del>- return r;
</del><ins>+ return *r;
</ins><span class="cx"> return addSlowCase(vm, r);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE static PassRefPtr<StringImpl> addSlowCase(ExecState*, StringImpl* r);
- JS_EXPORT_PRIVATE static PassRefPtr<StringImpl> addSlowCase(VM*, StringImpl* r);
</del><ins>+ JS_EXPORT_PRIVATE static PassRef<StringImpl> addSlowCase(ExecState*, StringImpl* r);
+ JS_EXPORT_PRIVATE static PassRef<StringImpl> addSlowCase(VM*, StringImpl* r);
</ins><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE static void checkCurrentIdentifierTable(ExecState*);
</span><span class="cx"> JS_EXPORT_PRIVATE static void checkCurrentIdentifierTable(VM*);
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template <typename T>
</span><del>- PassRefPtr<StringImpl> Identifier::add(VM* vm, const T* s, int length)
</del><ins>+ PassRef<StringImpl> Identifier::add(VM* vm, const T* s, int length)
</ins><span class="cx"> {
</span><span class="cx"> if (length == 1) {
</span><span class="cx"> T c = s[0];
</span><span class="lines">@@ -187,13 +187,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!length)
</span><del>- return StringImpl::empty();
</del><ins>+ return *StringImpl::empty();
</ins><span class="cx"> CharBuffer<T> buf = { s, static_cast<unsigned>(length) };
</span><span class="cx"> HashSet<StringImpl*>::AddResult addResult = vm->identifierTable->add<CharBuffer<T>, IdentifierCharBufferTranslator<T>>(buf);
</span><span class="cx">
</span><span class="cx"> // If the string is newly-translated, then we need to adopt it.
</span><span class="cx"> // The boolean in the pair tells us if that is so.
</span><del>- return addResult.isNewEntry ? adoptRef(*addResult.iterator) : *addResult.iterator;
</del><ins>+ return addResult.isNewEntry ? adoptRef(**addResult.iterator) : **addResult.iterator;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool operator==(const Identifier& a, const Identifier& b)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeLookupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Lookup.cpp (163807 => 163808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2014-02-10 20:07:34 UTC (rev 163807)
+++ trunk/Source/JavaScriptCore/runtime/Lookup.cpp 2014-02-10 20:39:12 UTC (rev 163808)
</span><span class="lines">@@ -34,8 +34,8 @@
</span><span class="cx"> for (int i = 0; i < compactSize; ++i)
</span><span class="cx"> entries[i].setKey(0);
</span><span class="cx"> for (int i = 0; values[i].key; ++i) {
</span><del>- StringImpl* identifier = Identifier::add(&vm, values[i].key).leakRef();
- int hashIndex = identifier->existingHash() & compactHashSizeMask;
</del><ins>+ StringImpl& identifier = Identifier::add(&vm, values[i].key).leakRef();
+ int hashIndex = identifier.existingHash() & compactHashSizeMask;
</ins><span class="cx"> HashEntry* entry = &entries[hashIndex];
</span><span class="cx">
</span><span class="cx"> if (entry->key()) {
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> entry = entry->next();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- entry->initialize(identifier, values[i].attributes, values[i].value1, values[i].value2, values[i].intrinsic);
</del><ins>+ entry->initialize(&identifier, values[i].attributes, values[i].value1, values[i].value2, values[i].intrinsic);
</ins><span class="cx"> }
</span><span class="cx"> table = entries;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>