Changeset 251418 in webkit

Timestamp:

Oct 21, 2019, 10:44:31 PM (5 years ago)

Author:

mark.lam@apple.com

Message:

Rolling out r251411: Fix is incorrect.
​https://bugs.webkit.org/show_bug.cgi?id=203230

Not reviewed.

JSTests:

• stress/incorrect-exception-assertion-in-operationRegExpExecNonGlobalOrSticky.js: Removed.

Source/JavaScriptCore:

• dfg/DFGOperations.cpp:

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/incorrect-exception-assertion-in-operationRegExpExecNonGlobalOrSticky.js (deleted)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/dfg/DFGOperations.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2019-10-21  Mark Lam  <mark.lam@apple.com>
+
+        Rolling out r251411: Fix is incorrect.
+        https://bugs.webkit.org/show_bug.cgi?id=203230
+
+        Not reviewed.
+
+        * stress/incorrect-exception-assertion-in-operationRegExpExecNonGlobalOrSticky.js: Removed.
+
 2019-10-21  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-10-21  Mark Lam  <mark.lam@apple.com>
+
+        Rolling out r251411: Fix is incorrect.
+        https://bugs.webkit.org/show_bug.cgi?id=203230
+
+        Not reviewed.
+
+        * dfg/DFGOperations.cpp:
+
 2019-10-21  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -1246 +1246 @@
     MatchResult result;
     JSArray* array = createRegExpMatchesArray(vm, globalObject, string, input, regExp, lastIndex, result);
+    if (!array) {
+        ASSERT(!scope.exception());
+        return JSValue::encode(jsNull());
+    }
+
     RETURN_IF_EXCEPTION(scope, { });
-    ASSERT(array);
-
     globalObject->regExpGlobalData().recordMatch(vm, globalObject, regExp, string, result);
     return JSValue::encode(array);