Changeset 176622 in webkit

Timestamp:

Dec 1, 2014, 6:21:16 PM (12 years ago)

Author:

akling@apple.com

Message:

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:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/Identifier.h (modified) (1 diff)
• JavaScriptCore/runtime/IdentifierInlines.h (modified) (1 diff)
• JavaScriptCore/runtime/PrivateName.h (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/text/AtomicString.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+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):
+
 2014-12-01  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Identifier.h

@@ -45 +45 @@
     Identifier(VM* vm, const char (&characters)[charactersCount]) : m_string(add(vm, characters)) { ASSERT(m_string.impl()->isAtomic()); }
 
+    Identifier(ExecState*, AtomicStringImpl*);
+    Identifier(ExecState*, const AtomicString&);
     Identifier(ExecState* exec, StringImpl* rep) : m_string(add(exec, rep)) { ASSERT(m_string.impl()->isAtomic()); }
     Identifier(ExecState* exec, const String& s) : m_string(add(exec, s.impl())) { ASSERT(m_string.impl()->isAtomic()); }
+    Identifier(ExecState* exec, const char* s) : Identifier(exec, AtomicString(s)) { }
 
     Identifier(VM* vm, const LChar* s, int length) : m_string(add(vm, s, length)) { ASSERT(m_string.impl()->isAtomic()); }

trunk/Source/JavaScriptCore/runtime/IdentifierInlines.h

@@ -32 +32 @@
 namespace JSC  {
 
+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
+}
+
 inline PassRef<StringImpl> Identifier::add(ExecState* exec, StringImpl* r)
 {

trunk/Source/JavaScriptCore/runtime/PrivateName.h

@@ -43 +43 @@
     }
 
-    StringImpl* uid() const { return m_impl.get(); }
+    AtomicStringImpl* uid() const { return static_cast<AtomicStringImpl*>(m_impl.get()); }
 
 private:

trunk/Source/WTF/ChangeLog

@@ +1 @@
+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:
+
 2014-12-01  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/WTF/wtf/text/AtomicString.h

@@ -205 +205 @@
     }
 
+#if !ASSERT_DISABLED
+    WTF_EXPORT_STRING_API static bool isInAtomicStringTable(StringImpl*);
+#endif
+
 private:
     // The explicit constructors with AtomicString::ConstructFromLiteral must be used for literals.
@@ -216 +220 @@
     WTF_EXPORT_STRING_API static AtomicStringImpl* findSlowCase(StringImpl&);
     WTF_EXPORT_STRING_API static AtomicString fromUTF8Internal(const char*, const char*);
-
-#if !ASSERT_DISABLED
-    WTF_EXPORT_STRING_API static bool isInAtomicStringTable(StringImpl*);
-#endif
 };