Change bottom-up to top-down check

Author: kwonjeomsim

src/parser/CodeBlock.h

@@ -990,7 +990,7 @@ class InterpretedCodeBlock : public CodeBlock {
 #endif
 
 #ifndef ESCARGOT_DEBUGGER
-    uint16_t m_parameterUsed : 16;
+    uint16_t m_parameterUsed : 16; // 0xFFFF means all parameters are used or function has more than 16 parameters
 #endif
 
     uint16_t m_functionLength : 16;

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,50 @@ 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;
+    void setParameterUsedValue(ASTScopeContext* scopeCtx)
+    {
         while (scopeCtx) {
-            if (!scopeCtx->m_parameters.size()) {
-                scopeCtx->m_parameterUsed = 0xFFFF;
-            }
-
-            if (scopeCtx->m_parameterUsed == 0xFFFF) {
-                scopeCtx = scopeCtx->m_parentScope;
-                continue;
-            }
+            for (size_t i = 0; i < this->currentScopeContext->m_parameters.size(); i++) {
+                if (this->currentScopeContext->m_parameterUsed == 0xFFFF) {
+                    break;
+                }
 
-            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);
+                AtomicString name = this->currentScopeContext->m_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 (UNLIKELY(VectorUtil::findInVector(blockCtx->m_usingNames, stringArguments) != VectorUtil::invalidIndex)) {
+                        this->currentScopeContext->m_parameterUsed = 0xFFFF;
                         break;
                     }
                 }
             }
 
-            scopeCtx = scopeCtx->m_parentScope;
+            if (scopeCtx->firstChild()) {
+                setParameterUsedValue(scopeCtx->firstChild());
+            }
+
+            if (scopeCtx != this->currentScopeContext) {
+                scopeCtx = scopeCtx->nextSibling();
+            } else {
+                break;
+            }
         }
+    }
+#endif
+
+    ASTScopeContext* popScopeContext(ASTScopeContext* lastPushedScopeContext)
+    {
+#ifndef ESCARGOT_DEBUGGER
+        setParameterUsedValue(this->currentScopeContext);
 #endif
+        auto ret = this->currentScopeContext;
+        this->lastUsingName = AtomicString();
+        this->lastPoppedScopeContext = ret;
+        this->currentScopeContext = lastPushedScopeContext;
         return ret;
     }
 
@@ -381,10 +393,6 @@ class Parser {
             parentContext->appendChild(this->currentScopeContext);
         }
 
-#ifndef ESCARGOT_DEBUGGER
-        this->currentScopeContext->m_parentScope = parentContext;
-#endif
-
         return parentContext;
     }
 
@@ -1075,16 +1083,6 @@ 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;
-            }
-        }
-#endif
-
         if (this->trackUsingNames) {
             this->insertUsingName(ret->asIdentifier()->name());
         }
@@ -1755,9 +1753,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);
             }
 
@@ -3584,9 +3579,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);
             }
 
@@ -5108,7 +5100,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() == 0xFFFF || param->asRestElement()->argument()->type() != Identifier) {
 #endif
                         Node* statement = this->finalize(node, builder.createExpressionStatementNode(param));
                         container->appendChild(statement);