Title: [236141] releases/WebKitGTK/webkit-2.22
Revision
236141
Author
carlo...@webkit.org
Date
2018-09-18 08:59:31 -0700 (Tue, 18 Sep 2018)

Log Message

Merge r235662 - isAsyncGeneratorMethodParseMode() should check for SourceParseMode::AsyncGeneratorWrapperMethodMode.
https://bugs.webkit.org/show_bug.cgi?id=189292
<rdar://problem/38907433>

Reviewed by Saam Barati.

JSTests:

* stress/regress-189292.js: Added.

Source/_javascript_Core:

Previously, isAsyncGeneratorMethodParseMode() was checking for AsyncGeneratorWrapperFunctionMode
instead of AsyncGeneratorWrapperMethodMode.  This patch fixes it
to check for AsyncGeneratorWrapperMethodMode (to match what is expected as indicated
in the name isAsyncGeneratorMethodParseMode).

* parser/ParserModes.h:
(JSC::isAsyncGeneratorMethodParseMode):

Modified Paths

Added Paths

Diff

Modified: releases/WebKitGTK/webkit-2.22/JSTests/ChangeLog (236140 => 236141)


--- releases/WebKitGTK/webkit-2.22/JSTests/ChangeLog	2018-09-18 15:59:24 UTC (rev 236140)
+++ releases/WebKitGTK/webkit-2.22/JSTests/ChangeLog	2018-09-18 15:59:31 UTC (rev 236141)
@@ -1,3 +1,13 @@
+2018-09-05  Mark Lam  <mark....@apple.com>
+
+        isAsyncGeneratorMethodParseMode() should check for SourceParseMode::AsyncGeneratorWrapperMethodMode.
+        https://bugs.webkit.org/show_bug.cgi?id=189292
+        <rdar://problem/38907433>
+
+        Reviewed by Saam Barati.
+
+        * stress/regress-189292.js: Added.
+
 2018-09-03  Mark Lam  <mark....@apple.com>
 
         The watchdog sometimes fails to terminate a script.

Added: releases/WebKitGTK/webkit-2.22/JSTests/stress/regress-189292.js (0 => 236141)


--- releases/WebKitGTK/webkit-2.22/JSTests/stress/regress-189292.js	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.22/JSTests/stress/regress-189292.js	2018-09-18 15:59:31 UTC (rev 236141)
@@ -0,0 +1,18 @@
+//@ runDefault
+
+function assert(a, b) {
+    if (a != b)
+        throw "FAIL";
+}
+
+function test(script) {
+    try {
+        eval(script);
+    } catch (e) {
+        return e;
+    }
+}
+
+assert(test("class C1 { async constructor() { } }"), "SyntaxError: Cannot declare an async method named 'constructor'.");
+assert(test("class C1 { *constructor() { } }"), "SyntaxError: Cannot declare a generator function named 'constructor'.");
+assert(test("class C1 { async *constructor() { } }"), "SyntaxError: Cannot declare an async generator method named 'constructor'.");

Modified: releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/ChangeLog (236140 => 236141)


--- releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/ChangeLog	2018-09-18 15:59:24 UTC (rev 236140)
+++ releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/ChangeLog	2018-09-18 15:59:31 UTC (rev 236141)
@@ -1,3 +1,19 @@
+2018-09-05  Mark Lam  <mark....@apple.com>
+
+        isAsyncGeneratorMethodParseMode() should check for SourceParseMode::AsyncGeneratorWrapperMethodMode.
+        https://bugs.webkit.org/show_bug.cgi?id=189292
+        <rdar://problem/38907433>
+
+        Reviewed by Saam Barati.
+
+        Previously, isAsyncGeneratorMethodParseMode() was checking for AsyncGeneratorWrapperFunctionMode
+        instead of AsyncGeneratorWrapperMethodMode.  This patch fixes it
+        to check for AsyncGeneratorWrapperMethodMode (to match what is expected as indicated
+        in the name isAsyncGeneratorMethodParseMode).
+
+        * parser/ParserModes.h:
+        (JSC::isAsyncGeneratorMethodParseMode):
+
 2018-09-04  Michael Catanzaro  <mcatanz...@igalia.com>
 
         [WPE][GTK] Add more unused result warnings to JSC API

Modified: releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/parser/ParserModes.h (236140 => 236141)


--- releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/parser/ParserModes.h	2018-09-18 15:59:24 UTC (rev 236140)
+++ releases/WebKitGTK/webkit-2.22/Source/_javascript_Core/parser/ParserModes.h	2018-09-18 15:59:31 UTC (rev 236141)
@@ -188,7 +188,7 @@
     
 ALWAYS_INLINE bool isAsyncGeneratorMethodParseMode(SourceParseMode parseMode)
 {
-    return SourceParseModeSet(SourceParseMode::AsyncGeneratorWrapperFunctionMode).contains(parseMode);
+    return SourceParseModeSet(SourceParseMode::AsyncGeneratorWrapperMethodMode).contains(parseMode);
 }
 
 ALWAYS_INLINE bool isMethodParseMode(SourceParseMode parseMode)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to