[webkit-changes] [236505] trunk/Source/JavaScriptCore

[yusukesuzuki]

Title: [236505] trunk/Source/_javascript_Core

Revision

236505

Author

yusukesuz...@slowstart.org

Date

2018-09-26 09:12:42 -0700 (Wed, 26 Sep 2018)

Log Message

Unreviewed, add scope verification handling
https://bugs.webkit.org/show_bug.cgi?id=189780

* runtime/ArrayPrototype.cpp:
(JSC::arrayProtoFuncIndexOf):
(JSC::arrayProtoFuncLastIndexOf):

Modified Paths

• trunk/Source/_javascript_Core/ChangeLog
• trunk/Source/_javascript_Core/runtime/ArrayPrototype.cpp

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (236504 => 236505)

--- trunk/Source/_javascript_Core/ChangeLog	2018-09-26 16:12:34 UTC (rev 236504)
+++ trunk/Source/_javascript_Core/ChangeLog	2018-09-26 16:12:42 UTC (rev 236505)
@@ -1,3 +1,12 @@
+2018-09-26  Yusuke Suzuki  <yusukesuz...@slowstart.org>
+
+        Unreviewed, add scope verification handling
+        https://bugs.webkit.org/show_bug.cgi?id=189780
+
+        * runtime/ArrayPrototype.cpp:
+        (JSC::arrayProtoFuncIndexOf):
+        (JSC::arrayProtoFuncLastIndexOf):
+
 2018-09-26  Koby Boyango  <koby.b@mce.systems>
 
         [JSC] offlineasm parser should handle CRLF in asm files

Modified: trunk/Source/_javascript_Core/runtime/ArrayPrototype.cpp (236504 => 236505)

--- trunk/Source/_javascript_Core/runtime/ArrayPrototype.cpp	2018-09-26 16:12:34 UTC (rev 236504)
+++ trunk/Source/_javascript_Core/runtime/ArrayPrototype.cpp	2018-09-26 16:12:42 UTC (rev 236505)
@@ -1269,7 +1269,9 @@
     JSValue searchElement = exec->argument(0);
 
     if (isJSArray(thisObject)) {
-        if (JSValue result = fastIndexOf<IndexOfDirection::Forward>(exec, vm, asArray(thisObject), length, searchElement, index))
+        JSValue result = fastIndexOf<IndexOfDirection::Forward>(exec, vm, asArray(thisObject), length, searchElement, index);
+        RETURN_IF_EXCEPTION(scope, { });
+        if (result)
             return JSValue::encode(result);
     }
 
@@ -1318,7 +1320,9 @@
     JSValue searchElement = exec->argument(0);
 
     if (isJSArray(thisObject)) {
-        if (JSValue result = fastIndexOf<IndexOfDirection::Backward>(exec, vm, asArray(thisObject), length, searchElement, index))
+        JSValue result = fastIndexOf<IndexOfDirection::Backward>(exec, vm, asArray(thisObject), length, searchElement, index);
+        RETURN_IF_EXCEPTION(scope, { });
+        if (result)
             return JSValue::encode(result);
     }
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes