Changeset 34607 in webkit for trunk/JavaScriptCore/kjs/identifier.cpp

Timestamp:

Jun 16, 2008, 4:28:38 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

Make Identifier construction use an explicitly passed IdentifierTable.

No change on SunSpider total.

File:

• trunk/JavaScriptCore/kjs/identifier.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/identifier.cpp

@@ -125 +125 @@
 };
 
-PassRefPtr<UString::Rep> Identifier::add(const char* c)
+PassRefPtr<UString::Rep> Identifier::add(JSGlobalData* globalData, const char* c)
 {
     if (!c) {
@@ -137 +137 @@
     }
 
-    IdentifierTable& identifierTable = *JSGlobalData::threadInstance().identifierTable;
+    IdentifierTable& identifierTable = *globalData->identifierTable;
     LiteralIdentifierTable& literalIdentifierTable = identifierTable.literalTable();
 
@@ -150 +150 @@
 }
 
-PassRefPtr<UString::Rep> Identifier::add(JSGlobalData* globalData, const char* c)
-{
-    if (!c) {
-        UString::Rep::null.hash();
-        return &UString::Rep::null;
-    }
-
-    if (!c[0]) {
-        UString::Rep::empty.hash();
-        return &UString::Rep::empty;
-    }
-
-    IdentifierTable& identifierTable = *globalData->identifierTable;
-    LiteralIdentifierTable& literalIdentifierTable = identifierTable.literalTable();
-
-    const LiteralIdentifierTable::iterator& iter = literalIdentifierTable.find(c);
-    if (iter != literalIdentifierTable.end())
-        return iter->second;
-
-    UString::Rep* addedString = *identifierTable.add<const char*, CStringTranslator>(c).first;
-    literalIdentifierTable.add(c, addedString);
-
-    return addedString;
+PassRefPtr<UString::Rep> Identifier::add(ExecState* exec, const char* c)
+{
+    return add(&exec->globalData(), c);
 }
 
@@ -206 +186 @@
 };
 
-PassRefPtr<UString::Rep> Identifier::add(const UChar *s, int length)
+PassRefPtr<UString::Rep> Identifier::add(JSGlobalData* globalData, const UChar* s, int length)
 {
     if (!length) {
@@ -214 +194 @@
     
     UCharBuffer buf = {s, length}; 
-    return *JSGlobalData::threadInstance().identifierTable->add<UCharBuffer, UCharBufferTranslator>(buf).first;
-}
-
-PassRefPtr<UString::Rep> Identifier::addSlowCase(UString::Rep *r)
+    return *globalData->identifierTable->add<UCharBuffer, UCharBufferTranslator>(buf).first;
+}
+
+PassRefPtr<UString::Rep> Identifier::add(ExecState* exec, const UChar* s, int length)
+{
+    return add(&exec->globalData(), s, length);
+}
+
+PassRefPtr<UString::Rep> Identifier::addSlowCase(JSGlobalData* globalData, UString::Rep* r)
 {
     ASSERT(!r->identifierTable);
@@ -226 +211 @@
     }
 
-    return *JSGlobalData::threadInstance().identifierTable->add(r).first;
+    return *globalData->identifierTable->add(r).first;
+}
+
+PassRefPtr<UString::Rep> Identifier::addSlowCase(ExecState* exec, UString::Rep* r)
+{
+    return addSlowCase(&exec->globalData(), r);
 }