Fix super() in constructor that contains object literal with a method or a get/set.

Author: rhuanjl

lib/Parser/Parse.cpp

@@ -4297,6 +4297,7 @@ ParseNodeBin * Parser::ParseMemberGetSet(OpCode nop, LPCOLESTR* ppNameHint)
         flags |= fFncOneArg;
     }
 
+    AutoParsingSuperRestrictionStateRestorer restorer(this);
     this->m_parsingSuperRestrictionState = ParsingSuperRestrictionState_SuperPropertyAllowed;
     ParseNodeFnc * pnodeFnc = ParseFncDeclNoCheckScope<buildAST>(flags, *ppNameHint,
         /*needsPIDOnRCurlyScan*/ false, /*resetParsingSuperRestrictionState*/ false);
@@ -4609,6 +4610,8 @@ ParseNodePtr Parser::ParseMemberList(LPCOLESTR pNameHint, uint32* pNameHintLengt
 
             // Rewind to the PID and parse a function expression.
             this->GetScanner()->SeekTo(atPid);
+
+            AutoParsingSuperRestrictionStateRestorer restorer(this);
             this->m_parsingSuperRestrictionState = ParsingSuperRestrictionState_SuperPropertyAllowed;
             ParseNodeFnc * pnodeFnc = ParseFncDeclNoCheckScope<buildAST>(fncDeclFlags | (isAsyncMethod ? fFncAsync : fFncNoFlgs), pFullNameHint,
                 /*needsPIDOnRCurlyScan*/ false, /*resetParsingSuperRestrictionState*/ false);

test/es6/classes.js

@@ -486,6 +486,39 @@ var tests = [
       assert.isTrue(classB.lambdaIndex() === 'method A', "classB.lambdaIndex() === 'method A'");
     }
   },
+  {
+      name: "Super used after object literal in constructor",
+      body: function () {
+        class emptyLiteral extends Object{
+          constructor(){
+            const bar = {};
+            super();
+          }
+        }
+        class methodLiteral extends Object{
+          constructor(){
+            const bar = { c () {}};
+            super();
+          }
+        }
+        class functionLiteral extends Object{
+          constructor(){
+            const bar = { c : function () {}};
+            super();
+          }
+        }
+        class getSetLiteral extends Object{
+          constructor(){
+            const bar = { hid : 5, get c () {return hid;}, set c (x) { hid = x; }};
+            super();
+          }
+        }
+        assert.doesNotThrow(()=>{new emptyLiteral()}, "Super should be valid in constructor after literal.");
+        assert.doesNotThrow(()=>{new methodLiteral()}, "Super should be valid in constructor after literal.");
+        assert.doesNotThrow(()=>{new functionLiteral()}, "Super should be valid in constructor after literal.");
+        assert.doesNotThrow(()=>{new getSetLiteral()}, "Super should be valid in constructor after literal.");
+      }
+  },
   {
     name: "Super used outside the class declaration function",
     body: function () {