Changeset 39350 in webkit for trunk/JavaScriptCore

Timestamp:

Dec 16, 2008, 6:23:02 PM (16 years ago)

Author:

[email protected]

Message:

2008-12-16 Darin Adler <Darin Adler>

Reviewed and landed by Cameron Zwarich.

Preparatory work for fixing

Bug 22887: Make UString::Rep use RefCounted rather than implementing its own ref counting
<​https://bugs.webkit.org/show_bug.cgi?id=22887>

Change the various string translators used by Identifier:add() so that
they never zero the ref count of a newly created UString::Rep. Also,
change similar code for AtomicString to use the same idiomatic style.

JavaScriptCore:

• runtime/Identifier.cpp: (JSC::CStringTranslator::translate): (JSC::Identifier::add): (JSC::UCharBufferTranslator::translate):

WebCore:

• platform/text/AtomicString.cpp: (WebCore::AtomicString::add):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Identifier.cpp (modified) (6 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-12-16  Darin Adler  <[email protected]>
+
+        Reviewed and landed by Cameron Zwarich.
+
+        Preparatory work for fixing
+
+        Bug 22887: Make UString::Rep use RefCounted rather than implementing its own ref counting
+        <https://bugs.webkit.org/show_bug.cgi?id=22887>
+
+        Change the various string translators used by Identifier:add() so that
+        they never zero the ref count of a newly created UString::Rep.
+
+        * runtime/Identifier.cpp:
+        (JSC::CStringTranslator::translate):
+        (JSC::Identifier::add):
+        (JSC::UCharBufferTranslator::translate):
+
 2008-12-16  Gavin Barraclough  <[email protected]>
 

trunk/JavaScriptCore/runtime/Identifier.cpp

@@ -97 +97 @@
 }
 
-struct CStringTranslator
-{
+struct CStringTranslator {
     static unsigned hash(const char* c)
     {
@@ -117 +116 @@
         
         UString::Rep* r = UString::Rep::create(d, static_cast<int>(length)).releaseRef();
-        r->rc = 0;
         r->_hash = hash;
 
@@ -144 +142 @@
         return iter->second;
 
-    UString::Rep* addedString = *identifierTable.add<const char*, CStringTranslator>(c).first;
-    literalIdentifierTable.add(c, addedString);
-
-    return addedString;
+    pair<HashSet<UString::Rep*>::iterator, bool> addResult = identifierTable.add<const char*, CStringTranslator>(c);
+
+    // If the string is newly-translated, then we need to adopt it.
+    // The boolean in the pair tells us if that is so.
+    RefPtr<UString::Rep> addedString = addResult.second ? adoptRef(*addResult.first) : *addResult.first;
+
+    literalIdentifierTable.add(c, addedString.get());
+
+    return addedString.release();
 }
 
@@ -160 +163 @@
 };
 
-struct UCharBufferTranslator
-{
+struct UCharBufferTranslator {
     static unsigned hash(const UCharBuffer& buf)
     {
@@ -179 +181 @@
         
         UString::Rep* r = UString::Rep::create(d, buf.length).releaseRef();
-        r->rc = 0;
         r->_hash = hash;
         
@@ -198 +199 @@
     }
     UCharBuffer buf = {s, length}; 
-    return *globalData->identifierTable->add<UCharBuffer, UCharBufferTranslator>(buf).first;
+    pair<HashSet<UString::Rep*>::iterator, bool> addResult = globalData->identifierTable->add<UCharBuffer, UCharBufferTranslator>(buf);
+
+    // If the string is newly-translated, then we need to adopt it.
+    // The boolean in the pair tells us if that is so.
+    return addResult.second ? adoptRef(*addResult.first) : *addResult.first;
 }