Changeset 39747 in webkit for trunk/JavaScriptCore/runtime/UString.cpp

Timestamp:

Jan 9, 2009, 9:53:36 AM (16 years ago)

Author:

[email protected]

Message:

2009-01-09 David Levin <​[email protected]>

Reviewed by Oliver Hunt.

​https://bugs.webkit.org/show_bug.cgi?id=23175

Added a template to make the pointer and flags combination
in UString more readable and less error prone.

File:

• trunk/JavaScriptCore/runtime/UString.cpp (modified) (18 diffs)

trunk/JavaScriptCore/runtime/UString.cpp

@@ -3 +3 @@
  *  Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *  Copyright (C) 2007 Cameron Zwarich ([email protected])
+ *  Copyright (c) 2009, Google Inc. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -187 +188 @@
 // 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, 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 };
+UString::Rep* UString::Rep::nullBaseString;
+UString::Rep* UString::Rep::emptyBaseString;
+UString* UString::nullUString;
+
+void initializeStaticBaseString(int len, UChar* buf, UString::Rep& base)
+{
+    base.offset = 0;
+    base.len = len;
+    base.rc = INT_MAX / 2;
+    base._hash = 0;
+    base.m_identifierTableAndFlags.setFlag(UString::Rep::StaticFlag);
+    base.baseString = &base;
+    base.buf = buf;
+    base.preCapacity = 0;
+    base.usedPreCapacity = 0;
+    base.capacity = 0;
+    base.usedCapacity = 0;
+    base.reportedCost = 0;
+}
+
+void initializeUString()
+{
+    UString::Rep::nullBaseString = new UString::Rep;
+    initializeStaticBaseString(0, 0, *UString::Rep::nullBaseString);
+
+    UString::Rep::emptyBaseString = new UString::Rep;
+    initializeStaticBaseString(0, &sharedEmptyChar, *UString::Rep::emptyBaseString);
+
+    UString::nullUString = new UString;
+}
 
 static char* statBuffer = 0; // Only used for debugging via UString::ascii().
@@ -206 +235 @@
     r->rc = 1;
     r->_hash = 0;
-    r->m_identifierTable = 0;
     r->baseString = r;
     r->reportedCost = 0;
@@ -238 +266 @@
     r->rc = 1;
     r->_hash = 0;
-    r->m_identifierTable = 0;
     r->baseString = base.releaseRef();
     r->reportedCost = 0;
@@ -256 +283 @@
 {
     if (!string)
-        return &UString::Rep::null;
+        return &UString::Rep::null();
 
     size_t length = strlen(string);
@@ -262 +289 @@
     UChar* p = buffer.data();
     if (conversionOK != convertUTF8ToUTF16(&string, string + length, &p, p + length))
-        return &UString::Rep::null;
+        return &UString::Rep::null();
 
     return UString::Rep::createCopying(buffer.data(), p - buffer.data());
@@ -495 +522 @@
 {
     if (!c)
-        return &UString::Rep::null;
+        return &UString::Rep::null();
 
     if (!c[0])
-        return &UString::Rep::empty;
+        return &UString::Rep::empty();
 
     size_t length = strlen(c);
     UChar* d = allocChars(length);
     if (!d)
-        return &UString::Rep::null;
+        return &UString::Rep::null();
     else {
         for (size_t i = 0; i < length; i++)
@@ -520 +547 @@
 {
     if (length == 0) 
-        m_rep = &Rep::empty;
+        m_rep = &Rep::empty();
     else
         m_rep = Rep::createCopying(c, length);
@@ -528 +555 @@
 {
     if (length == 0)
-        m_rep = &Rep::empty;
+        m_rep = &Rep::empty();
     else if (copy)
         m_rep = Rep::createCopying(c, length);
@@ -538 +565 @@
 {
     if (!buffer.size())
-        m_rep = &Rep::empty;
+        m_rep = &Rep::empty();
     else
         m_rep = Rep::createCopying(buffer.data(), buffer.size());
@@ -562 +589 @@
         // this is direct and has refcount of 1 (so we can just alter it directly)
         if (!expandCapacity(rep.get(), thisOffset + length))
-            rep = &UString::Rep::null;
+            rep = &UString::Rep::null();
         if (rep->data()) {
             copyChars(rep->data() + thisSize, tData, tSize);
@@ -571 +598 @@
         // this reaches the end of the buffer - extend it if it's long enough to append to
         if (!expandCapacity(rep.get(), thisOffset + length))
-            rep = &UString::Rep::null;
+            rep = &UString::Rep::null();
         if (rep->data()) {
             copyChars(rep->data() + thisSize, tData, tSize);
@@ -581 +608 @@
         UChar* d = allocChars(newCapacity);
         if (!d)
-            rep = &UString::Rep::null;
+            rep = &UString::Rep::null();
         else {
             copyChars(d, rep->data(), thisSize);
@@ -636 +663 @@
         UChar* d = allocChars(newCapacity);
         if (!d)
-            rep = &UString::Rep::null;
+            rep = &UString::Rep::null();
         else {
             copyChars(d, rep->data(), thisSize);
@@ -832 +859 @@
 }
 
-const UString& UString::null()
-{
-    static UString* n = new UString; // Should be called from main thread at least once to be safely initialized.
-    return *n;
-}
-
 UString UString::from(int i)
 {
@@ -1186 +1207 @@
 {
     if (!c) {
-        m_rep = &Rep::null;
+        m_rep = &Rep::null();
         return *this;
     }
 
     if (!c[0]) {
-        m_rep = &Rep::empty;
+        m_rep = &Rep::empty();
         return *this;
     }
@@ -1627 +1648 @@
 NEVER_INLINE void UString::makeNull()
 {
-    m_rep = &Rep::null;
+    m_rep = &Rep::null();
 }
 
@@ -1633 +1654 @@
 NEVER_INLINE UString::Rep* UString::nullRep()
 {
-    return &Rep::null;
+    return &Rep::null();
 }