Changeset 194509 in webkit for trunk/Source/JavaScriptCore/runtime/JSString.h

Timestamp:

Jan 3, 2016, 1:48:58 AM (9 years ago)

Author:

[email protected]

Message:

Remove redundant StringImpl substring creation function.
<​https://webkit.org/b/152652>

Reviewed by Daniel Bates.

Source/JavaScriptCore:

Remove jsSubstring8() and make the only call site use jsSubstring().

• runtime/JSString.h:

(JSC::jsSubstring8): Deleted.

• runtime/StringPrototype.cpp:

(JSC::replaceUsingRegExpSearch):

Source/WTF:

Remove StringImpl::createSubstringSharingImpl8() and make the only
caller use createSubstringSharingImpl() instead.

They do the same thing anyway, the only difference is that the branch
on is8Bit() now happens in the callee instead of at the call site.

• wtf/text/StringImpl.h:

(WTF::StringImpl::createSubstringSharingImpl8): Deleted.

File:

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

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -48 +48 @@
 JSString* jsSubstring(VM*, const String&, unsigned offset, unsigned length);
 JSString* jsSubstring(ExecState*, const String&, unsigned offset, unsigned length);
-JSString* jsSubstring8(VM*, const String&, unsigned offset, unsigned length);
-JSString* jsSubstring8(ExecState*, const String&, unsigned offset, unsigned length);
 
 // Non-trivial strings are two or more characters long.
@@ -556 +554 @@
 }
 
-inline JSString* jsSubstring8(VM* vm, const String& s, unsigned offset, unsigned length)
+inline JSString* jsSubstring(VM* vm, const String& s, unsigned offset, unsigned length)
 {
     ASSERT(offset <= static_cast<unsigned>(s.length()));
@@ -568 +566 @@
             return vm->smallStrings.singleCharacterString(c);
     }
-    return JSString::createHasOtherOwner(*vm, StringImpl::createSubstringSharingImpl8(s.impl(), offset, length));
-}
-
-inline JSString* jsSubstring(VM* vm, const String& s, unsigned offset, unsigned length)
-{
-    ASSERT(offset <= static_cast<unsigned>(s.length()));
-    ASSERT(length <= static_cast<unsigned>(s.length()));
-    ASSERT(offset + length <= static_cast<unsigned>(s.length()));
-    if (!length)
-        return vm->smallStrings.emptyString();
-    if (length == 1) {
-        UChar c = s.characterAt(offset);
-        if (c <= maxSingleCharacterString)
-            return vm->smallStrings.singleCharacterString(c);
-    }
     return JSString::createHasOtherOwner(*vm, StringImpl::createSubstringSharingImpl(s.impl(), offset, length));
 }
@@ -607 +590 @@
 inline JSString* jsString(ExecState* exec, const String& s) { return jsString(&exec->vm(), s); }
 inline JSString* jsSingleCharacterString(ExecState* exec, UChar c) { return jsSingleCharacterString(&exec->vm(), c); }
-inline JSString* jsSubstring8(ExecState* exec, const String& s, unsigned offset, unsigned length) { return jsSubstring8(&exec->vm(), s, offset, length); }
 inline JSString* jsSubstring(ExecState* exec, const String& s, unsigned offset, unsigned length) { return jsSubstring(&exec->vm(), s, offset, length); }
 inline JSString* jsNontrivialString(ExecState* exec, const String& s) { return jsNontrivialString(&exec->vm(), s); }