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

Timestamp:

Jul 30, 2008, 1:16:06 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoff Garen.

Add consistency checks to UString to document and enforce its design.

• kjs/ustring.cpp: (KJS::UString::Rep::create): (KJS::UString::Rep::destroy): (KJS::UString::Rep::checkConsistency): (KJS::UString::expandCapacity): (KJS::UString::expandPreCapacity): (KJS::UString::UString): (KJS::UString::spliceSubstringsWithSeparators): (KJS::UString::append):
• kjs/ustring.h: (KJS::UString::Rep::checkConsistency):

File:

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

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -200 +200 @@
     r->preCapacity = 0;
 
+    r->checkConsistency();
+
     // steal the single reference this Rep was created with
     return adoptRef(r);
@@ -207 +209 @@
 {
     ASSERT(base);
+    base->checkConsistency();
 
     int baseOffset = base->offset;
@@ -229 +232 @@
     r->preCapacity = 0;
 
+    r->checkConsistency();
+
     // steal the single reference this Rep was created with
     return adoptRef(r);
@@ -249 +254 @@
 void UString::Rep::destroy()
 {
+    checkConsistency();
+
     // Static null and empty strings can never be destroyed, but we cannot rely on 
     // reference counting, because ref/deref are not thread-safe.
@@ -356 +363 @@
 }
 
+#ifndef NDEBUG
+void UString::Rep::checkConsistency() const
+{
+    // Only base strings have non-zero shared data.
+    if (this != baseString) {
+        ASSERT(!buf);
+        ASSERT(!usedCapacity);
+        ASSERT(!capacity);
+        ASSERT(!usedPreCapacity);
+        ASSERT(!preCapacity);
+    }
+
+    // There is no recursion for base strings.
+    ASSERT(baseString == baseString->baseString);
+
+    if (isStatic()) {
+        // There are only two static strings: null and empty.
+        ASSERT(!len);
+
+        // Static strings cannot get in identifier tables, because they are globally shared.
+        ASSERT(!identifierTable());
+    }
+
+    // The string fits in buffer.
+    ASSERT(baseString->usedPreCapacity <= baseString->preCapacity);
+    ASSERT(baseString->usedCapacity <= baseString->capacity);
+    ASSERT(-offset <= baseString->usedPreCapacity);
+    ASSERT(offset + len <= baseString->usedCapacity);
+}
+#endif
+
 // put these early so they can be inlined
 inline size_t UString::expandedSize(size_t size, size_t otherSize) const
@@ -384 +422 @@
 void UString::expandCapacity(int requiredLength)
 {
+    m_rep->checkConsistency();
+
     Rep* r = m_rep->baseString;
 
@@ -399 +439 @@
     if (requiredLength > r->usedCapacity)
         r->usedCapacity = requiredLength;
+
+    m_rep->checkConsistency();
 }
 
 void UString::expandPreCapacity(int requiredPreCap)
 {
+    m_rep->checkConsistency();
+
     Rep* r = m_rep->baseString;
 
@@ -422 +466 @@
     if (requiredPreCap > r->usedPreCapacity)
         r->usedPreCapacity = requiredPreCap;
+
+    m_rep->checkConsistency();
 }
 
@@ -476 +522 @@
 UString::UString(const UString& a, const UString& b)
 {
+    a.rep()->checkConsistency();
+    b.rep()->checkConsistency();
+
     int aSize = a.size();
     int aOffset = a.m_rep->offset;
@@ -527 +576 @@
         }
     }
+    a.rep()->checkConsistency();
+    b.rep()->checkConsistency();
+    m_rep->checkConsistency();
 }
 
@@ -679 +731 @@
 UString UString::spliceSubstringsWithSeparators(const Range* substringRanges, int rangeCount, const UString* separators, int separatorCount) const
 {
+    m_rep->checkConsistency();
+
     if (rangeCount == 1 && separatorCount == 0) {
         int thisSize = size();
@@ -719 +773 @@
 UString& UString::append(const UString &t)
 {
+    m_rep->checkConsistency();
+    t.rep()->checkConsistency();
+
     int thisSize = size();
     int thisOffset = m_rep->offset;
@@ -759 +816 @@
     }
 
+    m_rep->checkConsistency();
+    t.rep()->checkConsistency();
+
     return *this;
 }
@@ -764 +824 @@
 UString& UString::append(const UChar* tData, int tSize)
 {
+    m_rep->checkConsistency();
+
     int thisSize = size();
     int thisOffset = m_rep->offset;
@@ -803 +865 @@
     }
 
+    m_rep->checkConsistency();
+
     return *this;
 }
@@ -808 +872 @@
 UString& UString::append(const char* t)
 {
+    m_rep->checkConsistency();
+
     int thisSize = size();
     int thisOffset = m_rep->offset;
@@ -853 +919 @@
     }
 
+    m_rep->checkConsistency();
+
     return *this;
 }
@@ -858 +926 @@
 UString& UString::append(UChar c)
 {
+    m_rep->checkConsistency();
+
     int thisOffset = m_rep->offset;
     int length = size();
@@ -903 +973 @@
         }
     }
+
+    m_rep->checkConsistency();
 
     return *this;