Changeset 35418 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Jul 29, 2008, 1:16:17 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Oliver Hunt.

Store UString::Rep::isStatic bit in identifierTable pointer instead of reportedCost for
slightly nicer code and a 0.5% SunSpider improvement.

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -170 +170 @@
 // reduce the possibility of it becoming zero due to ref/deref not being thread-safe.
 static UChar sharedEmptyChar;
-UString::Rep UString::Rep::null = { 0, 0, INT_MAX / 2, 0, 0, &UString::Rep::null, true, 0, 0, 0, 0, 0, 0 };
-UString::Rep UString::Rep::empty = { 0, 0, INT_MAX / 2, 0, 0, &UString::Rep::empty, true, 0, &sharedEmptyChar, 0, 0, 0, 0 };
+UString::Rep UString::Rep::null = { 0, 0, INT_MAX / 2, 0, 1, &UString::Rep::null, 0, 0, 0, 0, 0, 0 };
+UString::Rep UString::Rep::empty = { 0, 0, INT_MAX / 2, 0, 1, &UString::Rep::empty, 0, &sharedEmptyChar, 0, 0, 0, 0 };
 
 static char* statBuffer = 0; // Only used for debugging via UString::ascii().
@@ -191 +191 @@
     r->rc = 1;
     r->_hash = 0;
-    r->identifierTable = 0;
+    r->m_identifierTable = 0;
     r->baseString = r;
-    r->isStatic = false;
     r->reportedCost = 0;
     r->buf = d;
@@ -221 +220 @@
     r->rc = 1;
     r->_hash = 0;
-    r->identifierTable = 0;
+    r->m_identifierTable = 0;
     r->baseString = base.releaseRef();
-    r->isStatic = false;
     r->reportedCost = 0;
     r->buf = 0;
@@ -253 +251 @@
     // Static null and empty strings can never be destroyed, but we cannot rely on 
     // reference counting, because ref/deref are not thread-safe.
-    if (!isStatic) {
-        if (identifierTable)
+    if (!isStatic()) {
+        if (identifierTable())
             Identifier::remove(this);
         if (baseString == this)