Fix bug with top-level-await with class variable init

* Prevent native stack overflow * Fix bug in ExecutionState::inPauserScope Signed-off-by: Seonghyun Kim <[email protected]>
Samsung · Oct 24, 2023 · 97e698d · 97e698d
1 parent 7f7d8c3
commit 97e698d
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 29 deletions.
diff --git a/src/parser/ScriptParser.cpp b/src/parser/ScriptParser.cpp
@@ -419,6 +419,12 @@ ScriptParser::InitializeScriptResult ScriptParser::initializeScript(String* orig
     if (LIKELY(needByteCodeGeneration)) {
         try {
 #if defined(ENABLE_CODE_CACHE)
+            // give up if there is top-level-await
+            if (topCodeBlock->isAsync()) {
+                cacheable = false;
+                deleteCodeBlockCacheInfo();
+            }
+
             // Store cache
             if (cacheable) {
                 codeCache->prepareCacheWriting(srcHash);

diff --git a/src/runtime/ExecutionPauser.cpp b/src/runtime/ExecutionPauser.cpp
@@ -74,43 +74,45 @@ ExecutionPauser::ExecutionPauser(ExecutionState& state, Object* sourceObject, Ex
 {
 }
 
-class ExecutionPauserExecutionStateParentBinder {
-public:
-    ExecutionPauserExecutionStateParentBinder(ExecutionState& state, ExecutionState* originalState)
-        : m_originalState(originalState)
-    {
-        m_oldParent = m_originalState->parent();
-
-
-        ExecutionState* pstate = m_originalState;
-        while (pstate) {
-            if (pstate == &state) {
-                // AsyncGeneratorObject::asyncGeneratorResolve can make loop
-                return;
+
+Value ExecutionPauser::start(ExecutionState& state, ExecutionPauser* self, Object* source, const Value& resumeValue, bool isAbruptReturn, bool isAbruptThrow, StartFrom from)
+{
+    class ExecutionPauserExecutionStateParentAndStackLimitBinder {
+    public:
+        ExecutionPauserExecutionStateParentAndStackLimitBinder(ExecutionState& state, ExecutionState* originalState)
+            : m_originalState(originalState)
+        {
+            m_oldParent = m_originalState->parent();
+
+            ExecutionState* pstate = m_originalState;
+            m_originalState->m_stackLimit = state.context()->vmInstance()->stackLimit();
+            while (pstate) {
+                if (pstate == &state) {
+                    // AsyncGeneratorObject::asyncGeneratorResolve can make loop
+                    return;
+                }
+                pstate = pstate->parent();
             }
-            pstate = pstate->parent();
-        }
 
-        m_originalState->setParent(&state);
-    }
+            m_originalState->setParent(&state);
+        }
 
-    ~ExecutionPauserExecutionStateParentBinder()
-    {
-        m_originalState->setParent(m_oldParent);
-    }
+        ~ExecutionPauserExecutionStateParentAndStackLimitBinder()
+        {
+            m_originalState->setParent(m_oldParent);
+            m_originalState->m_stackLimit = 0;
+        }
 
-    ExecutionState* m_originalState;
-    ExecutionState* m_oldParent;
-};
+        ExecutionState* m_originalState;
+        ExecutionState* m_oldParent;
+    };
 
-Value ExecutionPauser::start(ExecutionState& state, ExecutionPauser* self, Object* source, const Value& resumeValue, bool isAbruptReturn, bool isAbruptThrow, StartFrom from)
-{
     ExecutionState* originalState = self->m_executionState;
     while (!originalState->pauseSource()) {
         originalState = originalState->parent();
     }
 
-    ExecutionPauserExecutionStateParentBinder parentBinder(state, originalState);
+    ExecutionPauserExecutionStateParentAndStackLimitBinder parentBinder(state, originalState);
 
     if (self->m_resumeValueIndex != REGISTER_LIMIT) {
         self->m_registerFile[self->m_resumeValueIndex] = resumeValue;

diff --git a/src/runtime/ExecutionState.cpp b/src/runtime/ExecutionState.cpp
@@ -329,7 +329,11 @@ bool ExecutionState::inPauserScope()
             auto env = state->lexicalEnvironment();
             auto record = env->record();
             if (record->isGlobalEnvironmentRecord() || record->isModuleEnvironmentRecord()) {
-                return state->hasRareData() && state->rareData()->m_pauseSource;
+                // class variable initializer can call {GlobalEnvironment, ModuleEnvironment}
+                // so we should check above of {GlobalEnvironment, ModuleEnvironment}
+                if (state->hasRareData() && state->rareData()->m_pauseSource) {
+                    return true;
+                }
             } else if (record->isDeclarativeEnvironmentRecord() && record->asDeclarativeEnvironmentRecord()->isFunctionEnvironmentRecord()) {
                 return record->asDeclarativeEnvironmentRecord()->asFunctionEnvironmentRecord()->functionObject()->isScriptGeneratorFunctionObject()
                     || record->asDeclarativeEnvironmentRecord()->asFunctionEnvironmentRecord()->functionObject()->isScriptAsyncFunctionObject()

diff --git a/test/vendortest b/test/vendortest