Changeset 223043 in webkit

Timestamp:

Oct 9, 2017 2:59:26 AM (7 years ago)

Author:

gskachkov@gmail.com

Message:

Safari 10 /11 problem with if (!await get(something)).
​https://bugs.webkit.org/show_bug.cgi?id=176685

Reviewed by Saam Barati.

JSTests:

• stress/async-await-basic.js:

(awaitEpression.async):

• stress/async-await-syntax.js:

(testTopLevelAsyncAwaitSyntaxSloppyMode.testSyntax):
(prototype.testTopLevelAsyncAwaitSyntaxStrictMode):

Source/JavaScriptCore:

Using unary operator before await lead to count it as identifier.
According to spec ​https://tc39.github.io/ecma262/#sec-async-function-definitions
and Note 1 await is as AwaitExpression and it is allowed to use unary operator

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parsePrimaryExpression):

Location:

trunk

Files:

• JSTests/ChangeLog (modified) (1 diff)
• JSTests/stress/async-await-basic.js (modified) (1 diff)
• JSTests/stress/async-await-syntax.js (modified) (2 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (1 diff)

trunk/JSTests/ChangeLog

@@ +1 @@
+2017-10-09  Oleksandr Skachkov  <gskachkov@gmail.com>
+
+        Safari 10 /11 problem with if (!await get(something)).
+        https://bugs.webkit.org/show_bug.cgi?id=176685
+
+        Reviewed by Saam Barati.
+
+        * stress/async-await-basic.js:
+        (awaitEpression.async):
+        * stress/async-await-syntax.js:
+        (testTopLevelAsyncAwaitSyntaxSloppyMode.testSyntax):
+        (prototype.testTopLevelAsyncAwaitSyntaxStrictMode):
+
 2017-10-08  Saam Barati  <sbarati@apple.com>
 

trunk/JSTests/stress/async-await-basic.js

@@ -255 +255 @@
 shouldBe("start:4 resume:throw1 resume:throw2", log.join(" "));
 
+var awaitEpression = async (value) => {
+    log.push("start:" + value);
+    if (!await false)
+        log.push('step 1');
+    var t = ~await true;
+    log.push('step 2 ' + t);
+
+    var t1 = +await Promise.resolve(12345);
+    log.push('step 3 ' + t1);
+
+    var t2 = -await 54321;
+    log.push('step 4 ' + t2);
+
+    var t3 = !!!!!await Promise.resolve(true);
+    log.push('step 5 ' + t3);
+
+    try {
+        var t4 = ++await 1;
+    } catch(e) {
+        if (e instanceof ReferenceError) {
+            log.push('step 6 ');
+        } 
+    }
+
+    try {
+        var t5 = --await 1;
+    } catch(e) {
+        if (e instanceof ReferenceError) {
+            log.push('step 7');
+        } 
+    }
+
+    return void await 'test';
+};
+log = [];
+
+shouldBeAsync(undefined, () => awaitEpression(5));
+shouldBe("start:5 step 1 step 2 -2 step 3 12345 step 4 -54321 step 5 false step 6  step 7", log.join(" "));
+
 // MethoodDefinition SyntaxErrors
 shouldThrowSyntaxError("var obj = { async foo : true };", "Unexpected token ':'. Expected a parenthesis for argument list.");

trunk/JSTests/stress/async-await-syntax.js

@@ -35 +35 @@
     testSyntax(`({async: 1})`);
     testSyntax(`var asyncFn = async function() { await 1; };`);
+
+    testSyntax(`var asyncFn = async function() { var t = !await 1; };`);
+    testSyntax(`var asyncFn = async function() { var t = ~await 1; };`);
+    testSyntax(`var asyncFn = async function() { var t = typeof await 1; };`);
+    testSyntax(`var asyncFn = async function() { var t = void await 1; };`);
+    testSyntax(`var asyncFn = async function() { var t = !(await 1); };`);
+    testSyntax(`var asyncFn = async function() { var t = ~(await 1); };`);
+    testSyntax(`var asyncFn = async function() { var t = typeof (await 1); };`);
+    testSyntax(`var asyncFn = async function() { var t = void (await 1); };`);
+
+
+    testSyntax(`var asyncFn = async function() { var t = !!await 1; };`);
+    testSyntax(`var asyncFn = async function() { var t = ~~await 1; };`);
+    testSyntax(`var asyncFn = async function() { var t = typeof typeof await 1; };`);
+    testSyntax(`var asyncFn = async function() { var t = void void await 1; };`);
+
     testSyntax(`var asyncFn = async function withName() { await 1; };`);
     testSyntax(`var asyncFn = async () => await 'test';`);
+
+    testSyntax(`var asyncFn = async () => !await 'test';`);
+    testSyntax(`var asyncFn = async () => ~await 'test';`);
+    testSyntax(`var asyncFn = async () => typeof await 'test';`);
+    testSyntax(`var asyncFn = async () => void await 'test';`);
+    testSyntax(`var asyncFn = async () => - await 'test';`);
+    testSyntax(`var asyncFn = async () => + await 'test';`);
+    testSyntax(`var asyncFn = async () => delete await 'test';`);
+
+    testSyntax(`var asyncFn = async () => !!await 'test';`);
+    testSyntax(`var asyncFn = async () => ~~await 'test';`);
+    testSyntax(`var asyncFn = async () => typeof typeof await 'test';`);
+    testSyntax(`var asyncFn = async () => void void await 'test';`);
+
     testSyntax(`var asyncFn = async x => await x + 'test';`);
     testSyntax(`function foo(fn) { fn({ async: true }); }`);
@@ -70 +100 @@
     testSyntax(`"use strict"; ({async: 1})`);
     testSyntax(`"use strict"; var asyncFn = async function() { await 1; };`);
+
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = !await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = ~await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = +await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = -await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = typeof await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = void await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = !(await 1); };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = ~(await 1); };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = -(await 1); };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = +(await 1); };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = typeof (await 1); };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = void (await 1); };`);
+
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = !!await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = ~~await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = typeof typeof await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = void void await 1; };`);
+
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = !!await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = !~await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = !typeof typeof await 1; };`);
+    testSyntax(`"use strict"; var asyncFn = async function() { var t = !void void await 1; };`);
+
+
     testSyntax(`"use strict"; var asyncFn = async function withName() { await 1; };`);
     testSyntax(`"use strict"; var asyncFn = async () => await 'test';`);

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-10-09  Oleksandr Skachkov  <gskachkov@gmail.com>
+
+        Safari 10 /11 problem with if (!await get(something)).
+        https://bugs.webkit.org/show_bug.cgi?id=176685
+
+        Reviewed by Saam Barati.
+
+        Using unary operator before `await` lead to count it as identifier.
+        According to spec https://tc39.github.io/ecma262/#sec-async-function-definitions
+        and Note 1 `await` is as AwaitExpression and it is allowed to use unary operator
+
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parsePrimaryExpression):
+
 2017-10-07  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -4449 +4449 @@
         if (m_parserState.functionParsePhase == FunctionParsePhase::Parameters)
             failIfFalse(m_parserState.allowAwait, "Cannot use await expression within parameters");
+        else if (currentFunctionScope()->isAsyncFunctionBoundary())
+            return parseAwaitExpression(context);
+
         goto identifierExpression;
     case IDENT: {