Changeset 55679 in webkit for trunk/JavaScriptCore/runtime/JSString.h

Timestamp:

Mar 8, 2010, 12:31:02 PM (15 years ago)

Author:

[email protected]

Message:

Reverting 55035, this caused a regression.
(​https://bugs.webkit.org/show_bug.cgi?id=35843)

Reviewed by NOBODY (reverting regression).

• runtime/JSString.cpp:

(JSC::JSString::resolveRope):
(JSC::JSString::getStringPropertyDescriptor):

• runtime/JSString.h:

(JSC::jsSingleCharacterSubstring):
(JSC::JSString::getIndex):
(JSC::JSString::getStringPropertySlot):

• runtime/UStringImpl.cpp:
• runtime/UStringImpl.h:

File:

• trunk/JavaScriptCore/runtime/JSString.h (modified) (6 diffs)

trunk/JavaScriptCore/runtime/JSString.h

@@ -42 +42 @@
     JSString* jsSingleCharacterString(JSGlobalData*, UChar);
     JSString* jsSingleCharacterString(ExecState*, UChar);
+    JSString* jsSingleCharacterSubstring(JSGlobalData*, const UString&, unsigned offset);
     JSString* jsSingleCharacterSubstring(ExecState*, const UString&, unsigned offset);
     JSString* jsSubstring(JSGlobalData*, const UString&, unsigned offset, unsigned length);
@@ -365 +366 @@
     }
 
-    inline JSString* jsSingleCharacterSubstring(ExecState* exec, const UString& s, unsigned offset)
-    {
-        JSGlobalData* globalData = &exec->globalData();
-
+    inline JSString* jsSingleCharacterSubstring(JSGlobalData* globalData, const UString& s, unsigned offset)
+    {
         ASSERT(offset < static_cast<unsigned>(s.size()));
         UChar c = s.data()[offset];
@@ -393 +392 @@
     {
         ASSERT(canGetIndex(i));
-        if (!isRope())
-            return jsSingleCharacterSubstring(exec, m_value, i);
-
-        if (i < m_other.m_fibers[0]->length())
-            return jsString(exec, singleCharacterSubstring(m_other.m_fibers[0], i));
-        i -= m_other.m_fibers[0]->length();
-
-        ASSERT(m_fiberCount >= 2);
-        if (i < m_other.m_fibers[1]->length())
-            return jsString(exec, singleCharacterSubstring(m_other.m_fibers[1], i));
-        i -= m_other.m_fibers[1]->length();
-
-        ASSERT(m_fiberCount == 3);
-        ASSERT(i < m_other.m_fibers[2]->length());
-        return jsString(exec, singleCharacterSubstring(m_other.m_fibers[2], i));
+        return jsSingleCharacterSubstring(&exec->globalData(), value(exec), i);
     }
 
@@ -461 +446 @@
     inline JSString* jsString(ExecState* exec, const UString& s) { return jsString(&exec->globalData(), s); }
     inline JSString* jsSingleCharacterString(ExecState* exec, UChar c) { return jsSingleCharacterString(&exec->globalData(), c); }
+    inline JSString* jsSingleCharacterSubstring(ExecState* exec, const UString& s, unsigned offset) { return jsSingleCharacterSubstring(&exec->globalData(), s, offset); }
     inline JSString* jsSubstring(ExecState* exec, const UString& s, unsigned offset, unsigned length) { return jsSubstring(&exec->globalData(), s, offset, length); }
     inline JSString* jsNontrivialString(ExecState* exec, const UString& s) { return jsNontrivialString(&exec->globalData(), s); }
@@ -476 +462 @@
         unsigned i = propertyName.toStrictUInt32(&isStrictUInt32);
         if (isStrictUInt32 && i < m_length) {
-            slot.setValue(getIndex(exec, i));
+            slot.setValue(jsSingleCharacterSubstring(exec, value(exec), i));
             return true;
         }
@@ -486 +472 @@
     {
         if (propertyName < m_length) {
-            slot.setValue(getIndex(exec, propertyName));
+            slot.setValue(jsSingleCharacterSubstring(exec, value(exec), propertyName));
             return true;
         }