Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[JSC] Add global replace caching
https://bugs.webkit.org/show_bug.cgi?id=257826 rdar://110417641 Reviewed by Michael Saboff. This patch adds String.replace(/regexp-global/g, func) result cache, which is in the same fashion to V8's cache. We cache the result only when the subject string length is >= 0x1000, aligned to V8's behavior. This cache is cleared on every GC, so it does not affect on memory usage in practice: once GC happens, everything gets cleared, so it is not retaining things. * JSTests/stress/v8-regexp-results-cache.js: Added. * JSTests/stress/v8-string-replace-cache.js: Added. (replaceTest): (r): (i.r): (string_appeared_here.string_appeared_here.replace_obj.toString): (search_obj.toString): (replace_obj_side_effects.toString): (testIndices99): (testIndices59): (const.fake_replacer.Symbol.toPrimitive): * JSTests/stress/v8-string-replace.js: Added. (replaceTest): (r): (i.r): (string_appeared_here.string_appeared_here.replace_obj.toString): (search_obj.toString): (replace_obj_side_effects.toString): (testIndices99): (testIndices59): (const.fake_replacer.Symbol.toPrimitive): * Source/JavaScriptCore/CMakeLists.txt: * Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj: * Source/JavaScriptCore/heap/Heap.cpp: (JSC::Heap::finalize): * Source/JavaScriptCore/runtime/ArgList.h: * Source/JavaScriptCore/runtime/JSImmutableButterfly.cpp: (JSC::JSImmutableButterfly::tryCreateFromArgList): * Source/JavaScriptCore/runtime/JSImmutableButterfly.h: * Source/JavaScriptCore/runtime/OptionsList.h: * Source/JavaScriptCore/runtime/RegExpGlobalData.h: (JSC::RegExpGlobalData::ovector const): * Source/JavaScriptCore/runtime/RegExpGlobalDataInlines.h: (JSC::RegExpGlobalData::resetResultFromCache): * Source/JavaScriptCore/runtime/StringPrototype.cpp: (JSC::replaceUsingRegExpSearchWithCache): (JSC::replaceUsingRegExpSearch): * Source/JavaScriptCore/runtime/StringReplaceCache.h: Copied from Source/JavaScriptCore/runtime/RegExpGlobalData.h. (JSC::StringReplaceCache::clear): * Source/JavaScriptCore/runtime/StringReplaceCacheInlines.h: Added. (JSC::StringReplaceCache::get): (JSC::StringReplaceCache::set): * Source/JavaScriptCore/runtime/VM.h: Canonical link: https://commits.webkit.org/264967@main
- Loading branch information
1 parent
2ef6856
commit 0e3fcb9
Showing
16 changed files
with
1,008 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
// Copyright 2012 the V8 project authors. All rights reserved. | ||
// Redistribution and use in source and binary forms, with or without | ||
// modification, are permitted provided that the following conditions are | ||
// met: | ||
// | ||
// * Redistributions of source code must retain the above copyright | ||
// notice, this list of conditions and the following disclaimer. | ||
// * Redistributions in binary form must reproduce the above | ||
// copyright notice, this list of conditions and the following | ||
// disclaimer in the documentation and/or other materials provided | ||
// with the distribution. | ||
// * Neither the name of Google Inc. nor the names of its | ||
// contributors may be used to endorse or promote products derived | ||
// from this software without specific prior written permission. | ||
// | ||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
load("./resources/v8-mjsunit.js", "caller relative"); | ||
|
||
// Long string to trigger caching. | ||
var string = | ||
"Friends, Romans, countrymen, lend me your ears! \ | ||
I come to bury Caesar, not to praise him. \ | ||
The evil that men do lives after them, \ | ||
The good is oft interred with their bones; \ | ||
So let it be with Caesar. The noble Brutus \ | ||
Hath told you Caesar was ambitious; \ | ||
If it were so, it was a grievous fault, \ | ||
And grievously hath Caesar answer'd it. \ | ||
Here, under leave of Brutus and the rest- \ | ||
For Brutus is an honorable man; \ | ||
So are they all, all honorable men- \ | ||
Come I to speak in Caesar's funeral. \ | ||
He was my friend, faithful and just to me; \ | ||
But Brutus says he was ambitious, \ | ||
And Brutus is an honorable man. \ | ||
He hath brought many captives home to Rome, \ | ||
Whose ransoms did the general coffers fill. \ | ||
Did this in Caesar seem ambitious? \ | ||
When that the poor have cried, Caesar hath wept; \ | ||
Ambition should be made of sterner stuff: \ | ||
Yet Brutus says he was ambitious, \ | ||
And Brutus is an honorable man. \ | ||
You all did see that on the Lupercal \ | ||
I thrice presented him a kingly crown, \ | ||
Which he did thrice refuse. Was this ambition? \ | ||
Yet Brutus says he was ambitious, \ | ||
And sure he is an honorable man. \ | ||
I speak not to disprove what Brutus spoke, \ | ||
But here I am to speak what I do know. \ | ||
You all did love him once, not without cause; \ | ||
What cause withholds you then to mourn for him? \ | ||
O judgement, thou art fled to brutish beasts, \ | ||
And men have lost their reason. Bear with me; \ | ||
My heart is in the coffin there with Caesar, \ | ||
And I must pause till it come back to me."; | ||
|
||
var replaced = string.replace(/\b\w+\b/g, function() { return "foo"; }); | ||
for (var i = 0; i < 3; i++) { | ||
assertEquals(replaced, | ||
string.replace(/\b\w+\b/g, function() { return "foo"; })); | ||
} | ||
|
||
// Check that the result is in a COW array. | ||
var words = string.split(" "); | ||
assertEquals("Friends,", words[0]); | ||
words[0] = "Enemies,"; | ||
words = string.split(" "); | ||
assertEquals("Friends,", words[0]); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,303 @@ | ||
//@ requireOptions("--thresholdForStringReplaceCache=0") | ||
// Copyright 2009 the V8 project authors. All rights reserved. | ||
// Redistribution and use in source and binary forms, with or without | ||
// modification, are permitted provided that the following conditions are | ||
// met: | ||
// | ||
// * Redistributions of source code must retain the above copyright | ||
// notice, this list of conditions and the following disclaimer. | ||
// * Redistributions in binary form must reproduce the above | ||
// copyright notice, this list of conditions and the following | ||
// disclaimer in the documentation and/or other materials provided | ||
// with the distribution. | ||
// * Neither the name of Google Inc. nor the names of its | ||
// contributors may be used to endorse or promote products derived | ||
// from this software without specific prior written permission. | ||
// | ||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
/** | ||
* @fileoverview Test String.prototype.replace | ||
*/ | ||
|
||
load("./resources/v8-mjsunit.js", "caller relative"); | ||
|
||
function replaceTest(result, subject, pattern, replacement) { | ||
var name = | ||
"\"" + subject + "\".replace(" + pattern + ", " + replacement + ")"; | ||
assertEquals(result, subject.replace(pattern, replacement), name); | ||
} | ||
|
||
|
||
var short = "xaxbxcx"; | ||
|
||
replaceTest("axbxcx", short, "x", ""); | ||
replaceTest("axbxcx", short, /x/, ""); | ||
replaceTest("abc", short, /x/g, ""); | ||
|
||
replaceTest("xaxxcx", short, "b", ""); | ||
replaceTest("xaxxcx", short, /b/, ""); | ||
replaceTest("xaxxcx", short, /b/g, ""); | ||
|
||
|
||
replaceTest("[]axbxcx", short, "x", "[]"); | ||
replaceTest("[]axbxcx", short, /x/, "[]"); | ||
replaceTest("[]a[]b[]c[]", short, /x/g, "[]"); | ||
|
||
replaceTest("xax[]xcx", short, "b", "[]"); | ||
replaceTest("xax[]xcx", short, /b/, "[]"); | ||
replaceTest("xax[]xcx", short, /b/g, "[]"); | ||
|
||
|
||
replaceTest("[$]axbxcx", short, "x", "[$$]"); | ||
replaceTest("[$]axbxcx", short, /x/, "[$$]"); | ||
replaceTest("[$]a[$]b[$]c[$]", short, /x/g, "[$$]"); | ||
|
||
replaceTest("xax[$]xcx", short, "b", "[$$]"); | ||
replaceTest("xax[$]xcx", short, /b/, "[$$]"); | ||
replaceTest("xax[$]xcx", short, /b/g, "[$$]"); | ||
|
||
|
||
replaceTest("[]axbxcx", short, "x", "[$`]"); | ||
replaceTest("[]axbxcx", short, /x/, "[$`]"); | ||
replaceTest("[]a[xa]b[xaxb]c[xaxbxc]", short, /x/g, "[$`]"); | ||
|
||
replaceTest("xax[xax]xcx", short, "b", "[$`]"); | ||
replaceTest("xax[xax]xcx", short, /b/, "[$`]"); | ||
replaceTest("xax[xax]xcx", short, /b/g, "[$`]"); | ||
|
||
|
||
replaceTest("[x]axbxcx", short, "x", "[$&]"); | ||
replaceTest("[x]axbxcx", short, /x/, "[$&]"); | ||
replaceTest("[x]a[x]b[x]c[x]", short, /x/g, "[$&]"); | ||
|
||
replaceTest("xax[b]xcx", short, "b", "[$&]"); | ||
replaceTest("xax[b]xcx", short, /b/, "[$&]"); | ||
replaceTest("xax[b]xcx", short, /b/g, "[$&]"); | ||
|
||
|
||
replaceTest("[axbxcx]axbxcx", short, "x", "[$']"); | ||
replaceTest("[axbxcx]axbxcx", short, /x/, "[$']"); | ||
replaceTest("[axbxcx]a[bxcx]b[cx]c[]", short, /x/g, "[$']"); | ||
|
||
replaceTest("xax[xcx]xcx", short, "b", "[$']"); | ||
replaceTest("xax[xcx]xcx", short, /b/, "[$']"); | ||
replaceTest("xax[xcx]xcx", short, /b/g, "[$']"); | ||
|
||
|
||
replaceTest("[$1]axbxcx", short, "x", "[$1]"); | ||
replaceTest("[$1]axbxcx", short, /x/, "[$1]"); | ||
replaceTest("[]axbxcx", short, /x()/, "[$1]"); | ||
replaceTest("[$1]a[$1]b[$1]c[$1]", short, /x/g, "[$1]"); | ||
replaceTest("[]a[]b[]c[]", short, /x()/g, "[$1]"); | ||
|
||
replaceTest("xax[$1]xcx", short, "b", "[$1]"); | ||
replaceTest("xax[$1]xcx", short, /b/, "[$1]"); | ||
replaceTest("xax[]xcx", short, /b()/, "[$1]"); | ||
replaceTest("xax[$1]xcx", short, /b/g, "[$1]"); | ||
replaceTest("xax[]xcx", short, /b()/g, "[$1]"); | ||
|
||
// Bug 317 look-alikes. If "$e" has no meaning, the "$" must be retained. | ||
replaceTest("xax$excx", short, "b", "$e"); | ||
replaceTest("xax$excx", short, /b/, "$e"); | ||
replaceTest("xax$excx", short, /b/g, "$e"); | ||
|
||
replaceTest("xaxe$xcx", short, "b", "e$"); | ||
replaceTest("xaxe$xcx", short, /b/, "e$"); | ||
replaceTest("xaxe$xcx", short, /b/g, "e$"); | ||
|
||
|
||
replaceTest("[$$$1$$a1abb1bb0$002$3$03][$$$1$$b1bcc1cc0$002$3$03]c", | ||
"abc", /(.)(?=(.))/g, "[$$$$$$1$$$$$11$01$2$21$02$020$002$3$03]"); | ||
|
||
// Replace with functions. | ||
|
||
|
||
var ctr = 0; | ||
replaceTest("0axbxcx", short, "x", function r(m, i, s) { | ||
assertEquals(3, arguments.length, "replace('x',func) func-args"); | ||
assertEquals("x", m, "replace('x',func(m,..))"); | ||
assertEquals(0, i, "replace('x',func(..,i,..))"); | ||
assertEquals(short, s, "replace('x',func(..,s))"); | ||
return String(ctr++); | ||
}); | ||
assertEquals(1, ctr, "replace('x',func) num-match"); | ||
|
||
ctr = 0; | ||
replaceTest("0axbxcx", short, /x/, function r(m, i, s) { | ||
assertEquals(3, arguments.length, "replace(/x/,func) func-args"); | ||
assertEquals("x", m, "replace(/x/,func(m,..))"); | ||
assertEquals(0, i, "replace(/x/,func(..,i,..))"); | ||
assertEquals(short, s, "replace(/x/,func(..,s))"); | ||
return String(ctr++); | ||
}); | ||
assertEquals(1, ctr, "replace(/x/,func) num-match"); | ||
|
||
ctr = 0; | ||
replaceTest("0a1b2c3", short, /x/g, function r(m, i, s) { | ||
assertEquals(3, arguments.length, "replace(/x/g,func) func-args"); | ||
assertEquals("x", m, "replace(/x/g,func(m,..))"); | ||
assertEquals(ctr * 2, i, "replace(/x/g,func(..,i,.))"); | ||
assertEquals(short, s, "replace(/x/g,func(..,s))"); | ||
return String(ctr++); | ||
}); | ||
assertEquals(4, ctr, "replace(/x/g,func) num-match"); | ||
|
||
ctr = 0; | ||
replaceTest("0a1b2cx", short, /(x)(?=(.))/g, function r(m, c1, c2, i, s) { | ||
assertEquals(5, arguments.length, "replace(/(x)(?=(.))/g,func) func-args"); | ||
assertEquals("x", m, "replace(/(x)(?=(.))/g,func(m,..))"); | ||
assertEquals("x", c1, "replace(/(x)(?=(.))/g,func(..,c1,..))"); | ||
assertEquals(["a","b","c"][ctr], c2, "replace(/(x)(?=(.))/g,func(..,c2,..))"); | ||
assertEquals(ctr * 2, i, "replace(/(x)(?=(.))/g,func(..,i,..))"); | ||
assertEquals(short, s, "replace(/(x)(?=(.))/g,func(..,s))"); | ||
return String(ctr++); | ||
}); | ||
assertEquals(3, ctr, "replace(/x/g,func) num-match"); | ||
|
||
|
||
/* | ||
replaceTest("ABCD", "abcd", /(.)/g, function r(m, c1, i, s) { | ||
assertEquals("d", RegExp.lastMatch); | ||
assertEquals("d", RegExp.$1); | ||
assertEquals("abc", RegExp.leftContext); | ||
return m.toUpperCase(); | ||
}); | ||
*/ | ||
|
||
|
||
var long = ""; | ||
while (long.length < 0x2000) { | ||
long += String.fromCharCode(65 + Math.random() * 26); | ||
} | ||
|
||
for (var i = 0; i < 3; i++) { | ||
replaceTest(long.toLowerCase(), long, /(..)/g, function r(m, c1, i, s) { | ||
var expected = long.substring(0x1ffe, 0x2000); | ||
assertEquals(expected, RegExp.lastMatch); | ||
assertEquals(expected, RegExp.$1); | ||
assertEquals(long.substring(0, 0x1ffe), RegExp.leftContext); | ||
return m.toLowerCase(); | ||
}); | ||
} | ||
|
||
|
||
// Test special cases of replacement parts longer than 1<<11. | ||
var longstring = "xyzzy"; | ||
longstring = longstring + longstring; | ||
longstring = longstring + longstring; | ||
longstring = longstring + longstring; | ||
longstring = longstring + longstring; | ||
longstring = longstring + longstring; | ||
longstring = longstring + longstring; | ||
longstring = longstring + longstring; | ||
longstring = longstring + longstring; | ||
longstring = longstring + longstring; | ||
longstring = longstring + longstring; | ||
longstring = longstring + longstring; | ||
// longstring.length == 5 << 11 | ||
|
||
replaceTest(longstring + longstring, | ||
"<" + longstring + ">", /<(.*)>/g, "$1$1"); | ||
|
||
replaceTest("string 42", "string x", /x/g, function() { return 42; }); | ||
replaceTest("string 42", "string x", /x/, function() { return 42; }); | ||
replaceTest("string 42", "string x", /[xy]/g, function() { return 42; }); | ||
replaceTest("string 42", "string x", /[xy]/, function() { return 42; }); | ||
replaceTest("string true", "string x", /x/g, function() { return true; }); | ||
replaceTest("string null", "string x", /x/g, function() { return null; }); | ||
replaceTest("string undefined", "string x", /x/g, function() { return undefined; }); | ||
|
||
replaceTest("aundefinedbundefinedcundefined", | ||
"abc", /(.)|(.)/g, function(m, m1, m2, i, s) { return m1+m2; }); | ||
|
||
// Test nested calls to replace, including that it sets RegExp.$& correctly. | ||
|
||
var str = 'She sells seashells by the seashore.'; | ||
var re = /sh/g; | ||
assertEquals('She sells sea$schells by the sea$schore.', | ||
str.replace(re,"$$" + 'sch')) | ||
|
||
|
||
var replace_obj = { length: 0, toString: function() { return "x"; }}; | ||
assertEquals("axc", "abc".replace(/b/, replace_obj)); | ||
assertEquals("axc", "abc".replace(/b/g, replace_obj)); | ||
|
||
var search_obj = { length: 1, toString: function() { return "b"; }}; | ||
assertEquals("axc", "abc".replace(search_obj, function() { return "x"; })); | ||
|
||
var side_effect_flag = false; | ||
var replace_obj_side_effects = { | ||
toString: function() { side_effect_flag = true; return "x" } | ||
} | ||
assertEquals("abc", "abc".replace(/z/g, replace_obj_side_effects)); | ||
assertTrue(side_effect_flag); // Side effect triggers even without a match. | ||
|
||
var regexp99pattern = ""; | ||
var subject = ""; | ||
for (var i = 0; i < 99; i++) { | ||
regexp99pattern += "(.)"; | ||
subject += String.fromCharCode(i + 24); | ||
} | ||
|
||
function testIndices99(re) { | ||
// Test $1 .. $99 | ||
for (var i = 1; i < 100; i++) { | ||
assertEquals(String.fromCharCode(i + 23), | ||
subject.replace(re, "$" + i)); | ||
} | ||
|
||
// Test $01 .. $09 | ||
for (var i = 1; i < 10; i++) { | ||
assertEquals(String.fromCharCode(i + 23), | ||
subject.replace(re, "$0" + i)); | ||
} | ||
|
||
assertEquals("$0", subject.replace(re, "$0")); | ||
assertEquals("$00", subject.replace(re, "$00")); | ||
assertEquals(String.fromCharCode(10 + 23) + "0", | ||
subject.replace(re, "$100")); | ||
} | ||
|
||
testIndices99(new RegExp(regexp99pattern)); | ||
testIndices99(new RegExp(regexp99pattern, "g")); | ||
|
||
var regexp59pattern = ""; | ||
for (var i = 0; i < 59; i++) regexp59pattern += "(.)"; | ||
|
||
function testIndices59(re) { | ||
// Test $60 .. $99. Captures reach up to 59. Per spec, how to deal | ||
// with this is implementation-dependent. We interpret $60 as $6 | ||
// followed by "0", $61 as $6, followed by "1" and so on. | ||
var tail = subject.substr(59); | ||
for (var i = 60; i < 100; i++) { | ||
assertEquals(String.fromCharCode(i / 10 + 23) + (i % 10) + tail, | ||
subject.replace(re, "$" + i)); | ||
} | ||
} | ||
|
||
testIndices59(new RegExp(regexp59pattern)); | ||
testIndices59(new RegExp(regexp59pattern, "g")); | ||
|
||
// Test that ToString(replace) is called. | ||
|
||
let replace_tostring_count = 0; | ||
const fake_replacer = { | ||
[Symbol.toPrimitive]: () => { replace_tostring_count++; return "b"; } | ||
}; | ||
|
||
"a".replace("x", fake_replacer); | ||
assertEquals(1, replace_tostring_count); | ||
|
||
"a".replace("a", fake_replacer); | ||
assertEquals(2, replace_tostring_count); |
Oops, something went wrong.