Change bottom-up to top-down check

Author: kwonjeomsim

src/parser/ast/ASTContext.h

@@ -322,9 +322,7 @@ struct ASTScopeContext {
     AtomicStringTightVector m_parameters;
     AtomicString m_functionName;
 #ifndef ESCARGOT_DEBUGGER
-    uint16_t m_parameterUsed : 16; // 0xFFFF means all parameters are used or function has more than 16 parameters
-
-    ASTScopeContext *m_parentScope;
+    uint16_t m_parameterUsed : 16;
 #endif
     ASTScopeContext *m_firstChild;
     ASTScopeContext *m_nextSibling;
@@ -709,7 +707,6 @@ struct ASTScopeContext {
         , m_classPrivateNames(nullptr)
 #ifndef ESCARGOT_DEBUGGER
         , m_parameterUsed(0)
-        , m_parentScope(nullptr)
 #endif
         , m_firstChild(nullptr)
         , m_nextSibling(nullptr)

src/parser/esprima_cpp/esprima.cpp

@@ -317,38 +317,48 @@ class Parser {
         }
     }
 
-    ASTScopeContext* popScopeContext(ASTScopeContext* lastPushedScopeContext)
-    {
-        auto ret = this->currentScopeContext;
-        this->lastUsingName = AtomicString();
-        this->lastPoppedScopeContext = ret;
-        this->currentScopeContext = lastPushedScopeContext;
 #ifndef ESCARGOT_DEBUGGER
-        ASTScopeContext* scopeCtx = ret;
-        while (scopeCtx) {
-            if (!scopeCtx->m_parameters.size()) {
-                scopeCtx->m_parameterUsed = 0xFFFF;
-            }
+    void checkUsedParameters(ASTScopeContext* scopeCtx)
+    {
+        AtomicStringTightVector& parameters = this->currentScopeContext->m_parameters;
 
-            if (scopeCtx->m_parameterUsed == 0xFFFF) {
-                scopeCtx = scopeCtx->m_parentScope;
-                continue;
+        for (size_t i = 0; i < parameters.size(); i++) {
+            AtomicString& name = parameters[i];
+            for (size_t j = 0; j < scopeCtx->m_childBlockScopes.size(); j++) {
+                ASTBlockContext& blockCtx = *scopeCtx->m_childBlockScopes[j];
+                if (VectorUtil::findInVector(blockCtx.m_usingNames, name) != VectorUtil::invalidIndex) {
+                    this->currentScopeContext->m_parameterUsed |= (1 << i);
+                    break;
+                } else if (scopeCtx->m_parameterUsed == DISABLE_PARAM_CHECK && VectorUtil::findInVector(blockCtx.m_usingNames, stringArguments) != VectorUtil::invalidIndex) {
+                    this->currentScopeContext->m_parameterUsed = DISABLE_PARAM_CHECK;
+                    return;
+                }
             }
+        }
 
-            for (size_t i = 0; i < scopeCtx->m_parameters.size(); i++) {
-                AtomicString paramName = scopeCtx->m_parameters[i];
-                for (size_t j = 0; j < ret->m_childBlockScopes.size(); j++) {
-                    ASTBlockContext* block = ret->m_childBlockScopes[j];
-                    if (VectorUtil::findInVector(block->m_usingNames, paramName) != VectorUtil::invalidIndex) {
-                        scopeCtx->m_parameterUsed |= (1 << i);
-                        break;
-                    }
-                }
+        // check nested functions
+        size_t childCount = scopeCtx->childCount();
+        if (childCount > 0) {
+            ASTScopeContext* child = scopeCtx->firstChild();
+            for (size_t i = 0; i < childCount; i++) {
+                checkUsedParameters(child);
+                child = child->nextSibling();
             }
+        }
+    }
+#endif
 
-            scopeCtx = scopeCtx->m_parentScope;
+    ASTScopeContext* popScopeContext(ASTScopeContext* lastPushedScopeContext)
+    {
+#ifndef ESCARGOT_DEBUGGER
+        if (LIKELY(this->currentScopeContext->m_parameterUsed != DISABLE_PARAM_CHECK)) {
+            checkUsedParameters(this->currentScopeContext);
         }
 #endif
+        auto ret = this->currentScopeContext;
+        this->lastUsingName = AtomicString();
+        this->lastPoppedScopeContext = ret;
+        this->currentScopeContext = lastPushedScopeContext;
         return ret;
     }
 
@@ -381,10 +391,6 @@ class Parser {
             parentContext->appendChild(this->currentScopeContext);
         }
 
-#ifndef ESCARGOT_DEBUGGER
-        this->currentScopeContext->m_parentScope = parentContext;
-#endif
-
         return parentContext;
     }
 
@@ -514,7 +520,7 @@ class Parser {
 #endif
 #ifndef ESCARGOT_DEBUGGER
         if (UNLIKELY(paramNames.size() > 16)) {
-            this->currentScopeContext->m_parameterUsed = 0xFFFF;
+            this->currentScopeContext->m_parameterUsed = DISABLE_PARAM_CHECK;
         }
 #endif
         this->currentScopeContext->m_parameters.resizeWithUninitializedValues(paramNames.size());
@@ -1077,11 +1083,7 @@ class Parser {
 
 #ifndef ESCARGOT_DEBUGGER
         if (UNLIKELY(ret->asIdentifier()->name() == this->stringArguments)) {
-            ASTScopeContext* scopeCtx = this->currentScopeContext;
-            while (scopeCtx) {
-                scopeCtx->m_parameterUsed = 0xFFFF;
-                scopeCtx = scopeCtx->m_parentScope;
-            }
+            this->currentScopeContext->m_parameterUsed = DISABLE_PARAM_CHECK;
         }
 #endif
 
@@ -1755,9 +1757,6 @@ class Parser {
                 this->currentScopeContext->m_parameterCount = 1;
                 this->currentScopeContext->m_parameters.resizeWithUninitializedValues(1);
                 this->currentScopeContext->m_parameters[0] = className;
-#ifndef ESCARGOT_DEBUGGER
-                this->currentScopeContext->m_parameterUsed |= 1;
-#endif
                 this->currentScopeContext->insertVarName(className, 0, true, true, true);
             }
 
@@ -2611,7 +2610,7 @@ class Parser {
                 if (exprNode->isIdentifier() && exprNode->asIdentifier()->name() == escargotContext->staticStrings().eval) {
                     this->currentScopeContext->m_hasEval = true;
 #ifndef ESCARGOT_DEBUGGER
-                    this->currentScopeContext->m_parameterUsed = 0xFFFF;
+                    this->currentScopeContext->m_parameterUsed = DISABLE_PARAM_CHECK;
 #endif
                 }
                 exprNode = this->finalize(this->startNode(startToken), builder.createCallExpressionNode(exprNode, args, optional));
@@ -3584,9 +3583,6 @@ class Parser {
                 this->currentScopeContext->m_parameterCount = 1;
                 this->currentScopeContext->m_parameters.resizeWithUninitializedValues(1);
                 this->currentScopeContext->m_parameters[0] = paramName;
-#ifndef ESCARGOT_DEBUGGER
-                this->currentScopeContext->m_parameterUsed |= 1;
-#endif
                 this->currentScopeContext->insertVarName(paramName, 0, true, true, true);
             }
 
@@ -5088,7 +5084,7 @@ class Parser {
                 switch (param->type()) {
                 case Identifier: {
 #ifndef ESCARGOT_DEBUGGER
-                    if (this->codeBlock->parameterUsed() & (1 << paramIndex) || this->codeBlock->parameterUsed() == 0xFFFF) {
+                    if (this->codeBlock->parameterUsed() & (1 << paramIndex) || this->codeBlock->parameterUsed() == DISABLE_PARAM_CHECK) {
 #endif
                         Node* init = this->finalize(node, builder.createInitializeParameterExpressionNode(param, paramIndex));
                         Node* statement = this->finalize(node, builder.createExpressionStatementNode(init));
@@ -5108,7 +5104,7 @@ class Parser {
                 }
                 case RestElement: {
 #ifndef ESCARGOT_DEBUGGER
-                    if (this->codeBlock->parameterUsed() & (1 << paramIndex) || param->asRestElement()->argument()->type() != Identifier || this->codeBlock->parameterUsed() == 0xFFFF) {
+                    if (this->codeBlock->parameterUsed() & (1 << paramIndex) || this->codeBlock->parameterUsed() == DISABLE_PARAM_CHECK || param->asRestElement()->argument()->type() != Identifier) {
 #endif
                         Node* statement = this->finalize(node, builder.createExpressionStatementNode(param));
                         container->appendChild(statement);

src/parser/esprima_cpp/esprima.h

@@ -55,6 +55,9 @@ struct Error : public gc {
 };
 
 #define ESPRIMA_RECURSIVE_LIMIT 1024
+#ifndef ESCARGOT_DEBUGGER
+#define DISABLE_PARAM_CHECK 0xFFFF
+#endif
 
 ProgramNode* parseProgram(::Escargot::Context* ctx, StringView source, ASTClassInfo* outerClassInfo,
                           bool isModule, bool strictFromOutside, bool inWith, bool allowSuperCallFromOutside,