[MERGE #6003 @akroshg] Fixing TrackAssignment for destructuring syntax

Merge pull request #6003 from akroshg:track

We got nullpointer AV as the destructuring syntax is erroneous and we will suppose to get an error.
But we did track assignment before. Fixing this by delaying the trackassignment after error checks.

Author: akroshg

lib/Parser/Parse.cpp

@@ -13102,6 +13102,7 @@ ParseNodePtr Parser::ParseDestructuredVarDecl(tokens declarationType, bool isDec
     ParseNodePtr pnodeElem = nullptr;
     int parenCount = 0;
     bool seenRest = false;
+    IdentToken token;
 
     // Save the Block ID prior to the increments, so we can restore it back.
     int originalCurrentBlockId = GetCurrentBlock()->blockId;
@@ -13173,7 +13174,6 @@ ParseNodePtr Parser::ParseDestructuredVarDecl(tokens declarationType, bool isDec
         if (!isDecl)
         {
             BOOL fCanAssign;
-            IdentToken token;
             // Look for postfix operator
             pnodeElem = ParsePostfixOperators<buildAST>(pnodeElem, TRUE, FALSE, FALSE, TRUE, &fCanAssign, &token);
         }
@@ -13190,7 +13190,6 @@ ParseNodePtr Parser::ParseDestructuredVarDecl(tokens declarationType, bool isDec
         else
         {
             BOOL fCanAssign;
-            IdentToken token;
             // We aren't declaring anything, so scan the ID reference manually.
             pnodeElem = ParseTerm<buildAST>(/* fAllowCall */ m_token.tk != tkSUPER, nullptr /*pNameHint*/, nullptr /*pHintLength*/, nullptr /*pShortNameOffset*/, &token, false,
                 FALSE, &fCanAssign);
@@ -13202,7 +13201,10 @@ ParseNodePtr Parser::ParseDestructuredVarDecl(tokens declarationType, bool isDec
                 Error(ERRInvalidAssignmentTarget);
             }
 
-            TrackAssignment<buildAST>(pnodeElem, &token);
+            if (buildAST)
+            {
+                TrackAssignment<buildAST>(pnodeElem, nullptr);
+            }
 
             if (buildAST)
             {
@@ -13217,7 +13219,6 @@ ParseNodePtr Parser::ParseDestructuredVarDecl(tokens declarationType, bool isDec
                 {
                     CheckStrictModeEvalArgumentsUsage(token.pid);
                 }
-                token.tk = tkNone;
             }
         }
     }
@@ -13292,6 +13293,11 @@ ParseNodePtr Parser::ParseDestructuredVarDecl(tokens declarationType, bool isDec
         Error(ERRsyntax);
     }
 
+    if (!buildAST && token.tk == tkID)
+    {
+        TrackAssignment<buildAST>(nullptr, &token);
+    }
+
     return pnodeElem;
 }
 

test/es6/destructuring_bugs.js

@@ -508,6 +508,20 @@ var tests = [
         };
         test1();
     }
+  },
+  {
+    name: "Destructuring expression : Array expression instead of name ",
+    body: function () {
+        function test1(){
+            assert.throws(function () { eval("({a: b => []} = [2])") }, SyntaxError, 
+                "", "Unexpected operator in destructuring expression");
+            
+            assert.throws(function () { eval("for([a => {}] in []);") }, SyntaxError,
+                "", "Unexpected operator in destructuring expression");
+                        
+        };
+        test1();
+    }
   }
 ];