Changeset 94336 in webkit

Timestamp:

Sep 1, 2011, 1:04:34 PM (14 years ago)

Author:

msaboff@apple.com

Message:

Remove simple usage of UString::characters() from JavaScriptCore
​https://bugs.webkit.org/show_bug.cgi?id=67340

In preparation to allowing StringImpl to be backed by 8 bit
characters when appropriate, we need to eliminate or change the
usage of StringImpl::characters(). Most of the changes below
change s->characters()[0] to s[0].

Reviewed by Geoffrey Garen.

• bytecompiler/BytecodeGenerator.cpp:

(JSC::keyForCharacterSwitch):

• bytecompiler/NodesCodegen.cpp:

(JSC::processClauseList):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/Identifier.cpp:

(JSC::Identifier::addSlowCase):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::jsToNumber):
(JSC::parseFloat):

• runtime/JSString.cpp:

(JSC::JSString::substringFromRope):

• runtime/JSString.h:

(JSC::jsSingleCharacterSubstring):
(JSC::jsString):
(JSC::jsSubstring):
(JSC::jsOwnedString):

• runtime/RegExp.cpp:

(JSC::regExpFlags):

• wtf/text/StringBuilder.h:

(WTF::StringBuilder::operator[]):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• bytecompiler/BytecodeGenerator.cpp (modified) (1 diff)
• bytecompiler/NodesCodegen.cpp (modified) (1 diff)
• interpreter/Interpreter.cpp (modified) (1 diff)
• jit/JITStubs.cpp (modified) (1 diff)
• runtime/Identifier.cpp (modified) (1 diff)
• runtime/JSGlobalObjectFunctions.cpp (modified) (2 diffs)
• runtime/JSString.cpp (modified) (1 diff)
• runtime/JSString.h (modified) (4 diffs)
• runtime/RegExp.cpp (modified) (1 diff)
• wtf/text/StringBuilder.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-09-01  Michael Saboff  <msaboff@apple.com>
+
+        Remove simple usage of UString::characters() from JavaScriptCore
+        https://bugs.webkit.org/show_bug.cgi?id=67340
+
+        In preparation to allowing StringImpl to be backed by 8 bit 
+        characters when appropriate, we need to eliminate or change the
+        usage of StringImpl::characters().  Most of the changes below
+        change s->characters()[0] to s[0].
+
+        Reviewed by Geoffrey Garen.
+
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::keyForCharacterSwitch):
+        * bytecompiler/NodesCodegen.cpp:
+        (JSC::processClauseList):
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::privateExecute):
+        * jit/JITStubs.cpp:
+        (JSC::DEFINE_STUB_FUNCTION):
+        * runtime/Identifier.cpp:
+        (JSC::Identifier::addSlowCase):
+        * runtime/JSGlobalObjectFunctions.cpp:
+        (JSC::jsToNumber):
+        (JSC::parseFloat):
+        * runtime/JSString.cpp:
+        (JSC::JSString::substringFromRope):
+        * runtime/JSString.h:
+        (JSC::jsSingleCharacterSubstring):
+        (JSC::jsString):
+        (JSC::jsSubstring):
+        (JSC::jsOwnedString):
+        * runtime/RegExp.cpp:
+        (JSC::regExpFlags):
+        * wtf/text/StringBuilder.h:
+        (WTF::StringBuilder::operator[]):
+
 2011-09-01  Ada Chan  <adachan@apple.com>
 

trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp

@@ -2274 +2274 @@
     ASSERT(clause->length() == 1);
     
-    int32_t key = clause->characters()[0];
+    int32_t key = (*clause)[0];
     ASSERT(key >= min);
     ASSERT(key <= max);

trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp

@@ -1741 +1741 @@
             const UString& value = static_cast<StringNode*>(clauseExpression)->value().ustring();
             if (singleCharacterSwitch &= value.length() == 1) {
-                int32_t intVal = value.impl()->characters()[0];
+                int32_t intVal = value[0];
                 if (intVal < min_num)
                     min_num = intVal;

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -4076 +4076 @@
                 vPC += defaultOffset;
             else
-                vPC += codeBlock->characterSwitchJumpTable(tableIndex).offsetForValue(value->characters()[0], defaultOffset);
+                vPC += codeBlock->characterSwitchJumpTable(tableIndex).offsetForValue((*value)[0], defaultOffset);
         }
         NEXT_INSTRUCTION();

trunk/Source/JavaScriptCore/jit/JITStubs.cpp

@@ -3454 +3454 @@
         StringImpl* value = asString(scrutinee)->value(callFrame).impl();
         if (value->length() == 1)
-            result = codeBlock->characterSwitchJumpTable(tableIndex).ctiForValue(value->characters()[0]).executableAddress();
+            result = codeBlock->characterSwitchJumpTable(tableIndex).ctiForValue((*value)[0]).executableAddress();
     }
 

trunk/Source/JavaScriptCore/runtime/Identifier.cpp

@@ -233 +233 @@
 
     if (r->length() == 1) {
-        UChar c = r->characters()[0];
+        UChar c = (*r)[0];
         if (c <= maxSingleCharacterString)
             r = globalData->smallStrings.singleCharacterStringRep(c);

trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -368 +368 @@
 
     if (size == 1) {
-        UChar c = s.characters()[0];
+        UChar c = s[0];
         if (isASCIIDigit(c))
             return c - '0';
@@ -411 +411 @@
 
     if (size == 1) {
-        UChar c = s.characters()[0];
+        UChar c = s[0];
         if (isASCIIDigit(c))
             return c - '0';

trunk/Source/JavaScriptCore/runtime/JSString.cpp

@@ -195 +195 @@
     if (substringLength == 1) {
         ASSERT(substringFiberCount == 1);
-        UChar c = substringFibers[0].characters()[0];
+        UChar c = substringFibers[0][0];
         if (c <= maxSingleCharacterString)
             return globalData->smallStrings.singleCharacterString(globalData, c);

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -561 +561 @@
         JSGlobalData* globalData = &exec->globalData();
         ASSERT(offset < static_cast<unsigned>(s.length()));
-        UChar c = s.characters()[offset];
+        UChar c = s[offset];
         if (c <= maxSingleCharacterString)
             return globalData->smallStrings.singleCharacterString(globalData, c);
@@ -596 +596 @@
             return globalData->smallStrings.emptyString(globalData);
         if (size == 1) {
-            UChar c = s.characters()[0];
+            UChar c = s[0];
             if (c <= maxSingleCharacterString)
                 return globalData->smallStrings.singleCharacterString(globalData, c);
@@ -624 +624 @@
             return globalData->smallStrings.emptyString(globalData);
         if (length == 1) {
-            UChar c = s.characters()[offset];
+            UChar c = s[offset];
             if (c <= maxSingleCharacterString)
                 return globalData->smallStrings.singleCharacterString(globalData, c);
@@ -637 +637 @@
             return globalData->smallStrings.emptyString(globalData);
         if (size == 1) {
-            UChar c = s.characters()[0];
+            UChar c = s[0];
             if (c <= maxSingleCharacterString)
                 return globalData->smallStrings.singleCharacterString(globalData, c);

trunk/Source/JavaScriptCore/runtime/RegExp.cpp

@@ -43 +43 @@
 
     for (unsigned i = 0; i < string.length(); ++i) {
-        switch (string.characters()[i]) {
+        switch (string[i]) {
         case 'g':
             if (flags & FlagGlobal)

trunk/Source/JavaScriptCore/wtf/text/StringBuilder.h

@@ -112 +112 @@
             return m_string[i];
         ASSERT(m_buffer);
-        return m_buffer->characters()[i];
+        return (*m_buffer)[i];
     }