Changeset 259747 in webkit for trunk/Source/JavaScriptCore/testRegExp.cpp

Timestamp:

Apr 8, 2020, 1:01:39 PM (5 years ago)

Author:

[email protected]

Message:

[JSC] Threading JSGlobalObject in RegExp::match properly
​https://bugs.webkit.org/show_bug.cgi?id=210174

Reviewed by Saam Barati.

We thread JSGlobalObject* properly in RegExp::match instead of accessing VM::topCallFrame, which is too hacky.

• runtime/RegExp.cpp:

(JSC::RegExp::match):
(JSC::RegExp::matchConcurrently):

• runtime/RegExp.h:
• runtime/RegExpGlobalData.h:
• runtime/RegExpGlobalDataInlines.h:

(JSC::RegExpGlobalData::performMatch):

• runtime/RegExpInlines.h:

(JSC::RegExp::matchInline):

• runtime/RegExpMatchesArray.h:

(JSC::createRegExpMatchesArray):

• runtime/RegExpObjectInlines.h:

(JSC::RegExpObject::matchInline):
(JSC::collectMatches):

• runtime/RegExpPrototype.cpp:

(JSC::regExpProtoFuncSearchFast):
(JSC::genericSplit):
(JSC::regExpProtoFuncSplitFast):

• runtime/StringPrototype.cpp:

(JSC::removeUsingRegExpSearch):
(JSC::replaceUsingRegExpSearch):

• testRegExp.cpp:

(testOneRegExp):
(runFromFiles):

File:

• trunk/Source/JavaScriptCore/testRegExp.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/testRegExp.cpp

@@ -189 +189 @@
 }
 
-static bool testOneRegExp(VM& vm, RegExp* regexp, RegExpTest* regExpTest, bool verbose, unsigned int lineNumber)
+static bool testOneRegExp(JSGlobalObject* globalObject, RegExp* regexp, RegExpTest* regExpTest, bool verbose, unsigned lineNumber)
 {
     bool result = true;
     Vector<int> outVector;
     outVector.resize(regExpTest->expectVector.size());
-    int matchResult = regexp->match(vm, regExpTest->subject, regExpTest->offset, outVector);
+    int matchResult = regexp->match(globalObject, regExpTest->subject, regExpTest->offset, outVector);
 
     if (matchResult != regExpTest->result) {
@@ -466 +466 @@
                 if (regexp && regExpTest) {
                     ++tests;
-                    if (!testOneRegExp(vm, regexp, regExpTest, verbose, lineNumber)) {
+                    if (!testOneRegExp(globalObject, regexp, regExpTest, verbose, lineNumber)) {
                         failures++;
                         printf("Failure on line %u\n", lineNumber);