Changeset 52762 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Jan 4, 2010, 2:49:27 PM (15 years ago)

Author:

[email protected]

Message:

Rubber stamped by Geoff Garen.

Add an 'isIdentifier' to UStringImpl, use this where appropriate
(where previously 'identifierTable' was being tested).

• API/JSClassRef.cpp:

(OpaqueJSClass::~OpaqueJSClass):
(OpaqueJSClassContextData::OpaqueJSClassContextData):

• runtime/Identifier.cpp:

(JSC::Identifier::addSlowCase):

• runtime/Identifier.h:

(JSC::Identifier::add):

• runtime/PropertyNameArray.cpp:

(JSC::PropertyNameArray::add):

• runtime/UStringImpl.h:

(JSC::UStringImpl::isIdentifier):

Location:

trunk/JavaScriptCore/runtime

Files:

• Identifier.cpp (modified) (1 diff)
• Identifier.h (modified) (2 diffs)
• PropertyNameArray.cpp (modified) (1 diff)
• UStringImpl.h (modified) (1 diff)

trunk/JavaScriptCore/runtime/Identifier.cpp

@@ -213 +213 @@
 PassRefPtr<UString::Rep> Identifier::addSlowCase(JSGlobalData* globalData, UString::Rep* r)
 {
-    ASSERT(!r->identifierTable());
+    ASSERT(!r->isIdentifier());
     if (r->size() == 1) {
         UChar c = r->data()[0];
         if (c <= 0xFF)
             r = globalData->smallStrings.singleCharacterStringRep(c);
-            if (r->identifierTable()) {
+            if (r->isIdentifier()) {
 #ifndef NDEBUG
                 checkSameIdentifierTable(globalData, r);

trunk/JavaScriptCore/runtime/Identifier.h

@@ -93 +93 @@
         static PassRefPtr<UString::Rep> add(ExecState* exec, UString::Rep* r)
         {
-            if (r->identifierTable()) {
+            if (r->isIdentifier()) {
 #ifndef NDEBUG
                 checkSameIdentifierTable(exec, r);
@@ -103 +103 @@
         static PassRefPtr<UString::Rep> add(JSGlobalData* globalData, UString::Rep* r)
         {
-            if (r->identifierTable()) {
+            if (r->isIdentifier()) {
 #ifndef NDEBUG
                 checkSameIdentifierTable(globalData, r);

trunk/JavaScriptCore/runtime/PropertyNameArray.cpp

@@ -31 +31 @@
 void PropertyNameArray::add(UString::Rep* identifier)
 {
-    ASSERT(identifier == &UString::Rep::null() || identifier == &UString::Rep::empty() || identifier->identifierTable());
+    ASSERT(identifier == &UString::Rep::null() || identifier == &UString::Rep::empty() || identifier->isIdentifier());
 
     size_t size = m_data->propertyNameVector().size();

trunk/JavaScriptCore/runtime/UStringImpl.h

@@ -138 +138 @@
     unsigned computedHash() const { ASSERT(m_hash); return m_hash; } // fast path for Identifiers
     void setHash(unsigned hash) { ASSERT(hash == computeHash(data(), m_length)); m_hash = hash; } // fast path for Identifiers
+    bool isIdentifier() const { return m_identifierTable; }
     IdentifierTable* identifierTable() const { return m_identifierTable; }
     void setIdentifierTable(IdentifierTable* table) { ASSERT(!isStatic()); m_identifierTable = table; }