Merge branch 'master' into feat-optional-chaining

Author: ShortDevelopment

ContributionAgreement.md

@@ -44,3 +44,4 @@ This agreement has been signed by:
 |Aidan Bickford| BickfordA|
 |Ryoichi Kaida| camcam-lemon|
 |Lukas Kurz| ShortDevelopment|
+|Paul Pluzhnikov|EmployedRussian|

lib/Common/DataStructures/ImmutableList.h

@@ -1,5 +1,6 @@
 //-------------------------------------------------------------------------------------------------------
 // Copyright (C) Microsoft. All rights reserved.
+// Copyright (c) ChakraCore Project Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 #pragma once
@@ -748,10 +749,16 @@ namespace regex
             return result;
         }
 
+#ifndef _MSC_VER
+       bool __attribute__((noinline)) CheckEq(void* obj1, void *obj2) { return obj1 == obj2; }
+#else
+#define CheckEq(a, b) (a) == (b)
+#endif
+
         // Info:        Return true if the list is empty.
         bool IsEmpty()
         {
-            return this==Empty();
+            return CheckEq(this, Empty());
         }
 
         // Info:        Return a list containing the given single value

lib/Common/arm64.h

@@ -11,7 +11,7 @@
 #error Include arm64.h in builds of ARM64 targets only.
 #endif
 
-#ifdef __getReg
+#if defined(__getReg) || defined(_WIN64)
 #define arm64_GET_CURRENT_FRAME() ((LPVOID)__getReg(29))
 #else
 extern "C" LPVOID arm64_GET_CURRENT_FRAME(void);

lib/Parser/Parse.cpp

@@ -3920,7 +3920,7 @@ ParseNodePtr Parser::ParsePostfixOperators(
         {
             AutoMarkInParsingArgs autoMarkInParsingArgs(this);
 
-            bool isNullPropagating = tkOptChain == this->GetScanner()->m_tkPrevious;
+            bool isNullPropagating = tkOptChain == this->GetScanner()->GetPrevious();
             if (fInNew)
             {
                 if (isNullPropagating)
@@ -4068,7 +4068,7 @@ ParseNodePtr Parser::ParsePostfixOperators(
         }
         case tkLBrack:
         {
-            bool isNullPropagating = tkOptChain == this->GetScanner()->m_tkPrevious;
+            bool isNullPropagating = tkOptChain == this->GetScanner()->GetPrevious();
 
             this->GetScanner()->Scan();
             IdentToken tok;
@@ -5545,7 +5545,7 @@ ParseNodeFnc * Parser::ParseFncDeclInternal(ushort flags, LPCOLESTR pNameHint, c
             {
                 // Class member methods have optional separators. We need to check whether we are
                 // getting the IchLim of the correct token.
-                Assert(this->GetScanner()->m_tkPrevious == tkRCurly && needScanRCurly);
+                Assert(this->GetScanner()->GetPrevious() == tkRCurly && needScanRCurly);
 
                 this->m_funcInArray += this->GetScanner()->IchMinTok() - /*tkRCurly*/ 1 - ichMin;
             }
@@ -6591,7 +6591,7 @@ bool Parser::FastScanFormalsAndBody()
         {
             int opl;
             OpCode nop;
-            tokens tkPrev = this->GetScanner()->m_tkPrevious;
+            tokens tkPrev = this->GetScanner()->GetPrevious();
             if ((this->GetHashTbl()->TokIsBinop(tkPrev, &opl, &nop) && nop != knopNone) ||
                 (this->GetHashTbl()->TokIsUnop(tkPrev, &opl, &nop) &&
                     nop != knopNone &&
@@ -11329,6 +11329,12 @@ ParseNodePtr Parser::ParseStatement()
     default:
         if (!this->GetScanner()->FHadNewLine())
         {
+            Token previous = this->GetScanner()->GetPreviousToken();
+            if (tkID == previous.tk && wellKnownPropertyPids.await == previous.GetIdentifier(this->GetHashTbl()))
+            {
+                Error(ERRBadAwait);
+            }
+
             Error(ERRnoSemic);
         }
         else

lib/Parser/Scan.cpp

@@ -1593,7 +1593,7 @@ tokens Scanner<EncodingPolicy>::ScanCore(bool identifyKwds)
     bool seenDelimitedCommentEnd = false;
 
     // store the last token
-    m_tkPrevious = m_ptoken->tk;
+    m_tokenPrevious = *m_ptoken;
     m_iecpLimTokPrevious = IecpLimTok();    // Introduced for use by lambda parsing to find correct span of expression lambdas
     m_ichLimTokPrevious = IchLimTok();
     size_t savedMultiUnits = this->m_cMultiUnits;

lib/Parser/Scan.h

@@ -1,5 +1,6 @@
 //-------------------------------------------------------------------------------------------------------
 // Copyright (C) Microsoft. All rights reserved.
+// Copyright (c) ChakraCore Project Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 #pragma once
@@ -705,7 +706,8 @@ class Scanner : public IScanner, public EncodingPolicy
         }
     };
 
-    tokens GetPrevious() { return m_tkPrevious; }
+    tokens GetPrevious() { return m_tokenPrevious.tk; }
+    Token GetPreviousToken() { return m_tokenPrevious; }
     void Capture(_Out_ RestorePoint* restorePoint);
     void SeekTo(const RestorePoint& restorePoint);
     void SeekToForcingPid(const RestorePoint& restorePoint);
@@ -756,7 +758,7 @@ class Scanner : public IScanner, public EncodingPolicy
     Js::ScriptContext* m_scriptContext;
     const Js::CharClassifier *charClassifier;
 
-    tokens m_tkPrevious;
+    Token m_tokenPrevious;
     size_t m_iecpLimTokPrevious;
     charcount_t m_ichLimTokPrevious;
 

pal/inc/cclock.hpp

@@ -9,14 +9,9 @@
 #ifndef CC_PAL_INC_CCLOCK_H
 #define CC_PAL_INC_CCLOCK_H
 
-#if defined(_M_ARM64)
-#define CCLOCK_ALIGN __declspec(align(8))
-#else
-#define CCLOCK_ALIGN
-#endif
-
-class CCLOCK_ALIGN CCLock
+class CCLock
 {
+    __declspec(align(sizeof(size_t)))
     char           mutexPtr[64]; // keep mutex implementation opaque to consumer (PAL vs non-PAL)
 
 public:

test/es7/asyncawait-syntax.js

@@ -1,5 +1,6 @@
 //-------------------------------------------------------------------------------------------------------
 // Copyright (C) Microsoft. All rights reserved.
+// Copyright (c) ChakraCore Project Contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
 //-------------------------------------------------------------------------------------------------------
 
@@ -58,26 +59,26 @@ var tests = [
     {
         name: "Await in eval global scope",
         body: function () {
-            assert.throws(function () { eval("var result = await call();"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", "Expected ';'");
-            assert.throws(function () { eval("await call();"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", "Expected ';'");
+            assert.throws(function () { eval("var result = await call();"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", `'await' expression not allowed in this context`);
+            assert.throws(function () { eval("await call();"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", `'await' expression not allowed in this context`);
 
-            assert.throws(function () { eval("await a;"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", "Expected ';'");
-            assert.throws(function () { eval("await a[0];"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", "Expected ';'");
-            assert.throws(function () { eval("await o.p;"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", "Expected ';'");
+            assert.throws(function () { eval("await a;"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", `'await' expression not allowed in this context`);
+            assert.throws(function () { eval("await a[0];"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", `'await' expression not allowed in this context`);
+            assert.throws(function () { eval("await o.p;"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", `'await' expression not allowed in this context`);
             assert.throws(function () { eval("a[await p];"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", "Expected ']'");
-            assert.throws(function () { eval("a + await p;"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", "Expected ';'");
-            assert.throws(function () { eval("await p + await q;"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", "Expected ';'");
+            assert.throws(function () { eval("a + await p;"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", `'await' expression not allowed in this context`);
+            assert.throws(function () { eval("await p + await q;"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", `'await' expression not allowed in this context`);
             assert.throws(function () { eval("foo(await p, await q);"); }, SyntaxError, "'await' keyword is not allowed in eval global scope", "Expected ')'");
 
             assert.throws(function () { eval("var lambdaParenNoArg = await () => x < y;"); }, SyntaxError, "'await' keyword is not allowed with a non-async lambda expression", "Syntax error");
-            assert.throws(function () { eval("var lambdaArgs = await async (a, b ,c) => a + b + c;"); }, SyntaxError, "There miss parenthises", "Expected ';'");
+            assert.throws(function () { eval("var lambdaArgs = await async (a, b ,c) => a + b + c;"); }, SyntaxError, "There miss parenthises", `'await' expression not allowed in this context`);
             assert.throws(function () { eval("var lambdaArgs = await (async (a, b ,c) => a + b + c);"); }, ReferenceError, "The 'await' function doesn't exists in this scope", "'await' is not defined");
         }
     },
     {
         name: "Await in a non-async function",
         body: function () {
-            assert.throws(function () { eval("function method() { var x = await call(); }"); }, SyntaxError, "'await' cannot be used in a non-async function.", "Expected ';'");
+            assert.throws(function () { eval("function method() { var x = await call(); }"); }, SyntaxError, "'await' cannot be used in a non-async function.", `'await' expression not allowed in this context`);
         }
     },
     {
@@ -216,6 +217,14 @@ var tests = [
             assert.throws(function () { eval("async function af() { (b = (c = await => {}) => {}) => {}; }"); }, SyntaxError, "await cannot appear as the formal name of an unparathensized arrow function in a nested case too", "Unexpected token '=>' after 'await'");
         }
     },
+    {
+        name: "Specific error message when using 'await' as a keyword outside 'async' context",
+        body: function () {
+            assert.throws(function () {
+                eval(`await new Promise(() => {});`);
+            }, SyntaxError, "await is not a keyword here", `'await' expression not allowed in this context`);
+        }
+    }
 ];
 
 testRunner.runTests(tests, { verbose: WScript.Arguments[0] != "summary" });

tools/regenByteCode.py

@@ -137,6 +137,8 @@ def append_bytecode(header, command, in_path, file_name, error):
     job.wait()
     if job.returncode != 0:
         print(error)
+        print('Command line: ')
+        print(*command_with_file)
         sys.exit(1)
 
 # Load file and ensure line endings are '\n' if on windows