[webkit-changes] [252721] trunk

Wed, 20 Nov 2019 17:17:30 -0800

Title: [252721] trunk
Revision
252721
Author
[email protected]
Date
2019-11-20 17:16:22 -0800 (Wed, 20 Nov 2019)

Log Message

Unreviewed, address Darin's feedback on r252683.

JSTests:

* stress/string-replaceall.js:

Source/_javascript_Core:

* runtime/StringPrototype.cpp:
(JSC::replaceUsingStringSearch):
(JSC::replace):
(JSC::stringProtoFuncReplaceUsingStringSearch):
(JSC::stringProtoFuncReplaceAllUsingStringSearch):

Source/WTF:

* wtf/text/StringCommon.h:
(WTF::findCommon):

Modified Paths

Diff

Modified: trunk/JSTests/ChangeLog (252720 => 252721)


--- trunk/JSTests/ChangeLog	2019-11-21 01:09:23 UTC (rev 252720)
+++ trunk/JSTests/ChangeLog	2019-11-21 01:16:22 UTC (rev 252721)
@@ -1,3 +1,9 @@
+2019-11-20  Ross Kirsling  <[email protected]>
+
+        Unreviewed, address Darin's feedback on r252683.
+
+        * stress/string-replaceall.js:
+
 2019-11-20  Caio Lima  <[email protected]>
 
         [JSC] OSR exit to LLInt is broken on MIPS

Modified: trunk/JSTests/stress/string-replaceall.js (252720 => 252721)


--- trunk/JSTests/stress/string-replaceall.js	2019-11-21 01:09:23 UTC (rev 252720)
+++ trunk/JSTests/stress/string-replaceall.js	2019-11-21 01:16:22 UTC (rev 252721)
@@ -34,3 +34,8 @@
 shouldBe('abcdefabcdefabc'.replaceAll(search, 'xyz'), 'q');
 search[Symbol.replace] = RegExp.prototype[Symbol.replace].bind(search);
 shouldBe('abcdefabcdefabc'.replaceAll(search, 'xyz'), 'abcxyzabcxyzabc');
+
+shouldBe('abc'.replaceAll('', 'z'), 'zazbzcz');
+shouldBe(''.replaceAll('', 'z'), 'z');
+shouldBe('abc'.replaceAll('', ''), 'abc');
+shouldBe(''.replaceAll('', ''), '');

Modified: trunk/Source/_javascript_Core/ChangeLog (252720 => 252721)


--- trunk/Source/_javascript_Core/ChangeLog	2019-11-21 01:09:23 UTC (rev 252720)
+++ trunk/Source/_javascript_Core/ChangeLog	2019-11-21 01:16:22 UTC (rev 252721)
@@ -1,3 +1,13 @@
+2019-11-20  Ross Kirsling  <[email protected]>
+
+        Unreviewed, address Darin's feedback on r252683.
+
+        * runtime/StringPrototype.cpp:
+        (JSC::replaceUsingStringSearch):
+        (JSC::replace):
+        (JSC::stringProtoFuncReplaceUsingStringSearch):
+        (JSC::stringProtoFuncReplaceAllUsingStringSearch):
+
 2019-11-20  Caio Lima  <[email protected]>
 
         [JSC] OSR exit to LLInt is broken on MIPS

Modified: trunk/Source/_javascript_Core/runtime/StringPrototype.cpp (252720 => 252721)


--- trunk/Source/_javascript_Core/runtime/StringPrototype.cpp	2019-11-21 01:09:23 UTC (rev 252720)
+++ trunk/Source/_javascript_Core/runtime/StringPrototype.cpp	2019-11-21 01:16:22 UTC (rev 252721)
@@ -776,7 +776,9 @@
         vm, globalObject, callFrame, string, searchValue, callData, callType, replacementString, replaceValue));
 }
 
-static ALWAYS_INLINE JSString* replaceUsingStringSearch(VM& vm, JSGlobalObject* globalObject, CallFrame* callFrame, JSString* jsString, JSValue searchValue, JSValue replaceValue, bool isGlobal)
+enum class ReplaceMode : bool { Single, Global };
+
+static ALWAYS_INLINE JSString* replaceUsingStringSearch(VM& vm, JSGlobalObject* globalObject, CallFrame* callFrame, JSString* jsString, JSValue searchValue, JSValue replaceValue, ReplaceMode mode)
 {
     auto scope = DECLARE_THROW_SCOPE(vm);
 
@@ -813,8 +815,7 @@
             cachedCall->appendArgument(substring);
             cachedCall->appendArgument(jsNumber(matchStart));
             cachedCall->appendArgument(jsString);
-            if (UNLIKELY(cachedCall->hasOverflowedArguments()))
-                OUT_OF_MEMORY(globalObject, scope);
+            ASSERT(!cachedCall->hasOverflowedArguments());
             JSValue replacement = cachedCall->call();
             RETURN_IF_EXCEPTION(scope, nullptr);
             replaceString = replacement.toWTFString(globalObject);
@@ -825,12 +826,11 @@
             OUT_OF_MEMORY(globalObject, scope);
 
         size_t matchEnd = matchStart + searchStringLength;
-        int ovector[2] = { static_cast<int>(matchStart),  static_cast<int>(matchEnd)};
-        if (cachedCall) {
+        if (cachedCall)
             replacements.append(replaceString);
-            RETURN_IF_EXCEPTION(scope, nullptr);
-        } else {
+        else {
             StringBuilder replacement(StringBuilder::OverflowHandler::RecordOverflow);
+            int ovector[2] = { static_cast<int>(matchStart),  static_cast<int>(matchEnd) };
             substituteBackreferences(replacement, replaceString, string, ovector, nullptr);
             if (UNLIKELY(replacement.hasOverflowed()))
                 OUT_OF_MEMORY(globalObject, scope);
@@ -838,9 +838,9 @@
         }
 
         endOfLastMatch = matchEnd;
-        if (!isGlobal)
+        if (mode == ReplaceMode::Single)
             break;
-        matchStart = string.find(searchString, UNLIKELY(!searchStringLength) ? endOfLastMatch + 1 : endOfLastMatch);
+        matchStart = string.find(searchString, !searchStringLength ? endOfLastMatch + 1 : endOfLastMatch);
     } while (matchStart != notFound);
 
     if (UNLIKELY(!sourceRanges.tryConstructAndAppend(endOfLastMatch, string.length() - endOfLastMatch)))
@@ -901,8 +901,7 @@
 {
     if (searchValue.inherits<RegExpObject>(vm))
         return replaceUsingRegExpSearch(vm, globalObject, callFrame, string, searchValue, replaceValue);
-    constexpr bool isGlobal = false;
-    return replaceUsingStringSearch(vm, globalObject, callFrame, string, searchValue, replaceValue, isGlobal);
+    return replaceUsingStringSearch(vm, globalObject, callFrame, string, searchValue, replaceValue, ReplaceMode::Single);
 }
 
 ALWAYS_INLINE JSString* replace(
@@ -942,8 +941,7 @@
     JSString* string = callFrame->thisValue().toString(globalObject);
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
 
-    constexpr bool isGlobal = false;
-    RELEASE_AND_RETURN(scope, JSValue::encode(replaceUsingStringSearch(vm, globalObject, callFrame, string, callFrame->argument(0), callFrame->argument(1), isGlobal)));
+    RELEASE_AND_RETURN(scope, JSValue::encode(replaceUsingStringSearch(vm, globalObject, callFrame, string, callFrame->argument(0), callFrame->argument(1), ReplaceMode::Single)));
 }
 
 EncodedJSValue JSC_HOST_CALL stringProtoFuncReplaceAllUsingStringSearch(JSGlobalObject* globalObject, CallFrame* callFrame)
@@ -954,8 +952,7 @@
     JSString* string = callFrame->thisValue().toString(globalObject);
     RETURN_IF_EXCEPTION(scope, encodedJSValue());
 
-    constexpr bool isGlobal = true;
-    RELEASE_AND_RETURN(scope, JSValue::encode(replaceUsingStringSearch(vm, globalObject, callFrame, string, callFrame->argument(0), callFrame->argument(1), isGlobal)));
+    RELEASE_AND_RETURN(scope, JSValue::encode(replaceUsingStringSearch(vm, globalObject, callFrame, string, callFrame->argument(0), callFrame->argument(1), ReplaceMode::Global)));
 }
 
 JSCell* JIT_OPERATION operationStringProtoFuncReplaceGeneric(JSGlobalObject* globalObject, EncodedJSValue thisValue, EncodedJSValue searchValue, EncodedJSValue replaceValue)

Modified: trunk/Source/WTF/ChangeLog (252720 => 252721)


--- trunk/Source/WTF/ChangeLog	2019-11-21 01:09:23 UTC (rev 252720)
+++ trunk/Source/WTF/ChangeLog	2019-11-21 01:16:22 UTC (rev 252721)
@@ -1,3 +1,10 @@
+2019-11-20  Ross Kirsling  <[email protected]>
+
+        Unreviewed, address Darin's feedback on r252683.
+
+        * wtf/text/StringCommon.h:
+        (WTF::findCommon):
+
 2019-11-20  ChangSeok Oh  <[email protected]>
 
         [GTK] Add ANGLE backend to GTK port

Modified: trunk/Source/WTF/wtf/text/StringCommon.h (252720 => 252721)


--- trunk/Source/WTF/wtf/text/StringCommon.h	2019-11-21 01:09:23 UTC (rev 252720)
+++ trunk/Source/WTF/wtf/text/StringCommon.h	2019-11-21 01:16:22 UTC (rev 252721)
@@ -574,7 +574,7 @@
         return notFound;
 
     if (!needleLength)
-        return std::min(start, haystack.length());
+        return start;
 
     unsigned searchLength = haystack.length() - start;
     if (needleLength > searchLength)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to