Move the check to see if function expression name is captured in the param scope into BindPidRefsInScope instead of requiring a separate PidRefStack walk

Author: boingoing

lib/Parser/Parse.cpp

@@ -1826,26 +1826,6 @@ void Parser::FinishParseBlock(ParseNodeBlock *pnodeBlock, bool needScanRCurly)
     }
 }
 
-void CheckFncExprNameCapturedInParamScope(ParseNodeFnc* pnodeFnc, ParseNodeBlock* pnodeFncExprScope)
-{
-    ParseNodeBlock* bodyScope = pnodeFnc->pnodeBodyScope;
-    ParseNodePtr pnodeName = pnodeFnc->pnodeName;
-
-    if (bodyScope == nullptr || pnodeName == nullptr || !pnodeFnc->IsBodyAndParamScopeMerged())
-    {
-        return;
-    }
-
-    for (PidRefStack* ref = pnodeName->AsParseNodeVar()->pid->GetTopRef(); ref && ref->id > pnodeFncExprScope->blockId; ref = ref->prev)
-    {
-        if (ref->id < bodyScope->blockId && ref->id > pnodeFncExprScope->blockId)
-        {
-            pnodeFncExprScope->scope->SetIsObject();
-            return;
-        }
-    }
-}
-
 void Parser::FinishParseFncExprScope(ParseNodeFnc * pnodeFnc, ParseNodeBlock * pnodeFncExprScope)
 {
     int fncExprScopeId = pnodeFncExprScope->blockId;
@@ -1993,6 +1973,20 @@ void Parser::BindPidRefsInScope(IdentPtr pid, Symbol *sym, int blockId, uint max
             }
         }
 
+        if (m_currentNodeFunc && m_currentNodeFunc->pnodeName && pid == m_currentNodeFunc->pnodeName->pid && !m_currentNodeFunc->IsDeclaration() && m_currentNodeFunc->IsBodyAndParamScopeMerged())
+        {
+            Scope* funcExprScope = m_currentNodeFunc->scope;
+            Assert(funcExprScope->GetScopeType() == ScopeType_FuncExpr);
+
+            ParseNodeBlock* bodyScope = m_currentNodeFunc->pnodeBodyScope;
+            Assert(bodyScope->blockType == PnodeBlockType::Function);
+
+            if (ref->GetScopeId() < bodyScope->blockId && ref->GetScopeId() > blockId)
+            {
+                funcExprScope->SetIsObject();
+            }
+        }
+
         if (ref->GetScopeId() == blockId)
         {
             break;
@@ -6038,11 +6032,6 @@ void Parser::ParseFncDeclHelper(ParseNodeFnc * pnodeFnc, LPCOLESTR pNameHint, us
 
         if (pnodeBlock)
         {
-            if (pnodeFncExprScope)
-            {
-                CheckFncExprNameCapturedInParamScope(pnodeFnc, pnodeFncExprScope);
-            }
-
             FinishParseBlock(pnodeBlock, *pNeedScanRCurly);
         }