Changeset 55943 in webkit for trunk/JavaScriptCore/runtime/UStringImpl.h

Timestamp:

Mar 12, 2010, 3:49:05 PM (15 years ago)

Author:

[email protected]

Message:

Bug 36075 - Clean up screwyness re static string impls & Identifiers.

Reviewed by Oliver Hunt.

JavaScriptCore:

• API/JSClassRef.cpp:

(OpaqueJSClass::~OpaqueJSClass): Classname may be null/empty, and these are an identifer. This is okay, since the null/empty strings are shared across all threads.

• JavaScriptCore.exp:
• runtime/Identifier.cpp:

(JSC::Identifier::add): No need to explicitly hash null reps, this is done in the ststic UStringImpl constructor.
(JSC::Identifier::addSlowCase): UStringImpl::empty() handled & checkCurrentIdentifierTable now called in the header.
(JSC::Identifier::checkCurrentIdentifierTable): Replaces checkSameIdentifierTable (this no longer checked the rep since the identifierTable pointer was removed from UString::Rep long ago).

• runtime/Identifier.h:

(JSC::Identifier::add): Replace call to checkSameIdentifierTable with call to checkCurrentIdentifierTable at head of function.

• runtime/UStringImpl.cpp:

(JSC::UStringImpl::~UStringImpl): Remove call to checkConsistency - this function no longer checks anything interesting.

• runtime/UStringImpl.h:

(JSC::UStringOrRopeImpl::UStringOrRopeImpl): Set s_refCountFlagIsIdentifier in static constructor.
(JSC::UStringImpl::UStringImpl): remove calls to checkConsistency (see above), add new ASSERT to substring constructor.
(JSC::UStringImpl::setHash): ASSERT not static (static strings set the hash in their constructor, should not reach this code path).
(JSC::UStringImpl::create): Add missing ASSERT.
(JSC::UStringImpl::setIsIdentifier): ASSERT !isStatic() (static strings hash set in constructor).

WebCore:

• platform/text/StringImpl.cpp:

(WebCore::StringImpl::~StringImpl): Add ASSERT
(WebCore::StringImpl::sharedBuffer): Add ASSERT

• platform/text/StringImpl.h:

(WebCore::StringImpl::setHash): Add ASSERT
(WebCore::StringImpl::isStatic): added.

File:

• trunk/JavaScriptCore/runtime/UStringImpl.h (modified) (11 diffs)

trunk/JavaScriptCore/runtime/UStringImpl.h

@@ -73 +73 @@
     enum StaticStringConstructType { ConstructStaticString };
     UStringOrRopeImpl(unsigned length, StaticStringConstructType)
-        : m_refCountAndFlags(s_refCountFlagStatic | BufferOwned)
+        : m_refCountAndFlags(s_refCountFlagStatic | s_refCountFlagIsIdentifier | BufferOwned)
         , m_length(length)
     {
@@ -126 +126 @@
     {
         hash();
-        checkConsistency();
     }
 
@@ -138 +137 @@
         ASSERT(m_data);
         ASSERT(m_length);
-        checkConsistency();
     }
 
@@ -150 +148 @@
         ASSERT(m_data);
         ASSERT(m_length);
-        checkConsistency();
     }
 
@@ -162 +159 @@
         ASSERT(m_data);
         ASSERT(m_length);
-        checkConsistency();
+        ASSERT(m_substringBuffer->bufferOwnership() != BufferSubstring);
     }
 
@@ -174 +171 @@
         ASSERT(m_data);
         ASSERT(m_length);
-        checkConsistency();
     }
 
@@ -180 +176 @@
     void setHash(unsigned hash)
     {
+        ASSERT(!isStatic());
         ASSERT(!m_hash);
         ASSERT(hash == computeHash(m_data, m_length));
@@ -194 +191 @@
     static PassRefPtr<UStringImpl> create(PassRefPtr<UStringImpl> rep, unsigned offset, unsigned length)
     {
+        ASSERT(rep);
+        ASSERT(length <= rep->length());
+
         if (!length)
             return empty();
-        ASSERT(rep);
-        rep->checkConsistency();
+
         UStringImpl* ownerRep = (rep->bufferOwnership() == BufferSubstring) ? rep->m_substringBuffer : rep.get();
         return adoptRef(new UStringImpl(rep->m_data + offset, length, ownerRep));
@@ -248 +247 @@
     void setIsIdentifier(bool isIdentifier)
     {
+        ASSERT(!isStatic());
         if (isIdentifier)
             m_refCountAndFlags |= s_refCountFlagIsIdentifier;
@@ -273 +273 @@
     }
 
-    ALWAYS_INLINE void checkConsistency() const
-    {
-        // There is no recursion of substrings.
-        ASSERT((bufferOwnership() != BufferSubstring) || (m_substringBuffer->bufferOwnership() != BufferSubstring));
-        // Static strings cannot be put in identifier tables, because they are globally shared.
-        ASSERT(!isStatic() || !isIdentifier());
-    }
-
 private:
     // This number must be at least 2 to avoid sharing empty, null as well as 1 character strings from SmallStrings.
@@ -288 +280 @@
     bool isStatic() const { return m_refCountAndFlags & s_refCountFlagStatic; }
 
-    // unshared data
     const UChar* m_data;
     union {