Do binding for special symbols even in defer parse

boingoing · boingoing · commit f47ec323ca8f · 2017-11-01T17:45:05.000-07:00
diff --git a/lib/Parser/Parse.cpp b/lib/Parser/Parse.cpp
@@ -1693,11 +1693,10 @@ ParseNodePtr Parser::CreateSpecialVarDeclIfNeeded(ParseNodePtr pnodeFnc, IdentPt
     return nullptr;
 }
 
-template<bool buildAST>
 void Parser::CreateSpecialSymbolDeclarations(ParseNodePtr pnodeFnc, bool isGlobal)
 {
     // Lambda function cannot have any special bindings.
-    if (!buildAST || pnodeFnc->sxFnc.IsLambda())
+    if (pnodeFnc->sxFnc.IsLambda())
     {
         return;
     }
@@ -5689,7 +5688,7 @@ bool Parser::ParseFncDeclHelper(ParseNodePtr pnodeFnc, LPCOLESTR pNameHint, usho
             UpdateArgumentsNode(pnodeFnc, argNode);
         }
 
-        CreateSpecialSymbolDeclarations<buildAST>(pnodeFnc, false);
+        CreateSpecialSymbolDeclarations(pnodeFnc, false);
 
         // Restore the lists of scopes that contain function expressions.
 
@@ -6981,7 +6980,7 @@ ParseNodePtr Parser::GenerateEmptyConstructor(bool extends)
 
     FinishParseBlock(pnodeInnerBlock);
 
-    CreateSpecialSymbolDeclarations<buildAST>(pnodeFnc, false);
+    CreateSpecialSymbolDeclarations(pnodeFnc, false);
 
     FinishParseBlock(pnodeBlock);
 
@@ -11241,7 +11240,7 @@ void Parser::FinishDeferredFunction(ParseNodePtr pnodeScopeList)
                 UpdateArgumentsNode(pnodeFnc, argNode);
             }
 
-            CreateSpecialSymbolDeclarations<true>(pnodeFnc, false);
+            CreateSpecialSymbolDeclarations(pnodeFnc, false);
 
             this->FinishParseBlock(pnodeBlock);
             if (pnodeFncExprBlock)
@@ -11624,7 +11623,7 @@ ParseNodePtr Parser::Parse(LPCUTF8 pszSrc, size_t offset, size_t length, charcou
     // We only need to create special symbol bindings for 'this' for indirect eval
     if ((this->m_grfscr & fscrEvalCode) && !(this->m_grfscr & fscrEval))
     {
-        CreateSpecialSymbolDeclarations<true>(pnodeProg, true);
+        CreateSpecialSymbolDeclarations(pnodeProg, true);
     }
 
     // Append an EndCode node.
diff --git a/lib/Parser/Parse.h b/lib/Parser/Parse.h
@@ -765,7 +765,7 @@ class Parser
     void FinishParseBlock(ParseNode *pnodeBlock, bool needScanRCurly = true);
     void FinishParseFncExprScope(ParseNodePtr pnodeFnc, ParseNodePtr pnodeFncExprScope);
 
-    template<bool buildAST> void CreateSpecialSymbolDeclarations(ParseNodePtr pnodeFnc, bool isGlobal);
+    void CreateSpecialSymbolDeclarations(ParseNodePtr pnodeFnc, bool isGlobal);
     ParseNodePtr ReferenceSpecialName(IdentPtr pid, charcount_t ichMin = 0, charcount_t ichLim = 0, bool createNode = false);
     ParseNodePtr CreateSpecialVarDeclIfNeeded(ParseNodePtr pnodeFnc, IdentPtr pid, bool forceCreate = false);
 
diff --git a/lib/Runtime/ByteCode/FuncInfo.cpp b/lib/Runtime/ByteCode/FuncInfo.cpp
@@ -139,7 +139,8 @@ BOOL FuncInfo::IsClassMember() const
     return this->byteCodeFunction->IsClassMethod();
 }
 
-BOOL FuncInfo::IsLambda() const {
+BOOL FuncInfo::IsLambda() const
+{
     return this->byteCodeFunction->IsLambda();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1693,11 +1693,10 @@ ParseNodePtr Parser::CreateSpecialVarDeclIfNeeded(ParseNodePtr pnodeFnc, IdentPt`
`1693`	`1693`	`return nullptr;`
`1694`	`1694`	`}`
`1695`	`1695`
`1696`		`-template<bool buildAST>`
`1697`	`1696`	`void Parser::CreateSpecialSymbolDeclarations(ParseNodePtr pnodeFnc, bool isGlobal)`
`1698`	`1697`	`{`
`1699`	`1698`	`// Lambda function cannot have any special bindings.`
`1700`		`- if (!buildAST \|\| pnodeFnc->sxFnc.IsLambda())`
	`1699`	`+ if (pnodeFnc->sxFnc.IsLambda())`
`1701`	`1700`	`{`
`1702`	`1701`	`return;`
`1703`	`1702`	`}`
`@@ -5689,7 +5688,7 @@ bool Parser::ParseFncDeclHelper(ParseNodePtr pnodeFnc, LPCOLESTR pNameHint, usho`
`5689`	`5688`	`UpdateArgumentsNode(pnodeFnc, argNode);`
`5690`	`5689`	`}`
`5691`	`5690`
`5692`		`- CreateSpecialSymbolDeclarations<buildAST>(pnodeFnc, false);`
	`5691`	`+ CreateSpecialSymbolDeclarations(pnodeFnc, false);`
`5693`	`5692`
`5694`	`5693`	`// Restore the lists of scopes that contain function expressions.`
`5695`	`5694`
`@@ -6981,7 +6980,7 @@ ParseNodePtr Parser::GenerateEmptyConstructor(bool extends)`
`6981`	`6980`
`6982`	`6981`	`FinishParseBlock(pnodeInnerBlock);`
`6983`	`6982`
`6984`		`- CreateSpecialSymbolDeclarations<buildAST>(pnodeFnc, false);`
	`6983`	`+ CreateSpecialSymbolDeclarations(pnodeFnc, false);`
`6985`	`6984`
`6986`	`6985`	`FinishParseBlock(pnodeBlock);`
`6987`	`6986`
`@@ -11241,7 +11240,7 @@ void Parser::FinishDeferredFunction(ParseNodePtr pnodeScopeList)`
`11241`	`11240`	`UpdateArgumentsNode(pnodeFnc, argNode);`
`11242`	`11241`	`}`
`11243`	`11242`
`11244`		`- CreateSpecialSymbolDeclarations<true>(pnodeFnc, false);`
	`11243`	`+ CreateSpecialSymbolDeclarations(pnodeFnc, false);`
`11245`	`11244`
`11246`	`11245`	`this->FinishParseBlock(pnodeBlock);`
`11247`	`11246`	`if (pnodeFncExprBlock)`
`@@ -11624,7 +11623,7 @@ ParseNodePtr Parser::Parse(LPCUTF8 pszSrc, size_t offset, size_t length, charcou`
`11624`	`11623`	`// We only need to create special symbol bindings for 'this' for indirect eval`
`11625`	`11624`	`if ((this->m_grfscr & fscrEvalCode) && !(this->m_grfscr & fscrEval))`
`11626`	`11625`	`{`
`11627`		`- CreateSpecialSymbolDeclarations<true>(pnodeProg, true);`
	`11626`	`+ CreateSpecialSymbolDeclarations(pnodeProg, true);`
`11628`	`11627`	`}`
`11629`	`11628`
`11630`	`11629`	`// Append an EndCode node.`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,8 @@ BOOL FuncInfo::IsClassMember() const`
`139`	`139`	`return this->byteCodeFunction->IsClassMethod();`
`140`	`140`	`}`
`141`	`141`
`142`		`-BOOL FuncInfo::IsLambda() const {`
	`142`	`+BOOL FuncInfo::IsLambda() const`
	`143`	`+{`
`143`	`144`	`return this->byteCodeFunction->IsLambda();`
`144`	`145`	`}`
`145`	`146`