Changeset 106257 in webkit

Timestamp:

Jan 30, 2012 10:51:36 AM (12 years ago)

Author:

msaboff@apple.com

Message:

stringProtoFuncReplace converts 8 bit strings to 16 bit during replacement
​https://bugs.webkit.org/show_bug.cgi?id=76651

Reviewed by Geoffrey Garen.

Made local function substituteBackreferencesSlow a template function
based on character width. Cleaned up getCharacters() in both UString
and StringImpl. Changed getCharacters<UChar> to up convert an 8 bit
string to 16 bits if necessary.

• runtime/StringPrototype.cpp:

(JSC::substituteBackreferencesSlow):
(JSC::substituteBackreferences):

• runtime/UString.h:

(JSC::LChar):
(JSC::UChar):

• wtf/text/StringImpl.h:

(WTF::UChar):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/StringPrototype.cpp (modified) (4 diffs)
• runtime/UString.h (modified) (1 diff)
• wtf/text/StringImpl.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-01-30  Michael Saboff  <msaboff@apple.com>
+
+        stringProtoFuncReplace converts 8 bit strings to 16 bit during replacement
+        https://bugs.webkit.org/show_bug.cgi?id=76651
+
+        Reviewed by Geoffrey Garen.
+
+        Made local function substituteBackreferencesSlow a template function
+        based on character width.  Cleaned up getCharacters() in both UString
+        and StringImpl.  Changed getCharacters<UChar> to up convert an 8 bit
+        string to 16 bits if necessary.
+
+        * runtime/StringPrototype.cpp:
+        (JSC::substituteBackreferencesSlow):
+        (JSC::substituteBackreferences):
+        * runtime/UString.h:
+        (JSC::LChar):
+        (JSC::UChar):
+        * wtf/text/StringImpl.h:
+        (WTF::UChar):
+
 2012-01-30  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/runtime/StringPrototype.cpp

@@ -171 +171 @@
 }
 
+template <typename CharType>
 static NEVER_INLINE UString substituteBackreferencesSlow(const UString& replacement, const UString& source, const int* ovector, RegExp* reg, size_t i)
 {
-    Vector<UChar> substitutedReplacement;
+    Vector<CharType> substitutedReplacement;
     int offset = 0;
     do {
@@ -183 +184 @@
             // "$$" -> "$"
             ++i;
-            substitutedReplacement.append(replacement.characters() + offset, i - offset);
+            substitutedReplacement.append(replacement.getCharacters<CharType>() + offset, i - offset);
             offset = i + 1;
             continue;
@@ -223 +224 @@
 
         if (i - offset)
-            substitutedReplacement.append(replacement.characters() + offset, i - offset);
+            substitutedReplacement.append(replacement.getCharacters<CharType>() + offset, i - offset);
         i += 1 + advance;
         offset = i + 1;
         if (backrefStart >= 0)
-            substitutedReplacement.append(source.characters() + backrefStart, backrefLength);
+            substitutedReplacement.append(source.getCharacters<CharType>() + backrefStart, backrefLength);
     } while ((i = replacement.find('$', i + 1)) != notFound);
 
     if (replacement.length() - offset)
-        substitutedReplacement.append(replacement.characters() + offset, replacement.length() - offset);
+        substitutedReplacement.append(replacement.getCharacters<CharType>() + offset, replacement.length() - offset);
 
     substitutedReplacement.shrinkToFit();
@@ -240 +241 @@
 {
     size_t i = replacement.find('$', 0);
-    if (UNLIKELY(i != notFound))
-        return substituteBackreferencesSlow(replacement, source, ovector, reg, i);
+    if (UNLIKELY(i != notFound)) {
+        if (replacement.is8Bit() && source.is8Bit())
+            return substituteBackreferencesSlow<LChar>(replacement, source, ovector, reg, i);
+        return substituteBackreferencesSlow<UChar>(replacement, source, ovector, reg, i);
+    }
     return replacement;
 }

trunk/Source/JavaScriptCore/runtime/UString.h

@@ -140 +140 @@
 
 template<>
-inline const LChar* UString::getCharacters<LChar>() const
-{
-    ASSERT(is8Bit());
-    return characters8();
-}
+inline const LChar* UString::getCharacters<LChar>() const { return characters8(); }
 
 template<>
-inline const UChar* UString::getCharacters<UChar>() const
-{
-    ASSERT(!is8Bit());
-    return characters16();
-}
+inline const UChar* UString::getCharacters<UChar>() const { return characters(); }
 
 NEVER_INLINE bool equalSlowCase(const UString& s1, const UString& s2);

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

@@ -551 +551 @@
 
 template <>
-ALWAYS_INLINE const UChar* StringImpl::getCharacters<UChar>() const { return characters16(); }
+ALWAYS_INLINE const UChar* StringImpl::getCharacters<UChar>() const { return characters(); }
 
 WTF_EXPORT_PRIVATE bool equal(const StringImpl*, const StringImpl*);