Fix crash

Force keep ByteCodeBlock* pointer in calling function routine. Some compiler don't keep pointer of ByteCodeBlock* in stack when calling function If don't keep the pointer, we can lose the ByteCodeBlock while GC Signed-off-by: Seonghyun Kim <[email protected]>
Samsung · Feb 1, 2024 · 55a36a2 · 55a36a2
1 parent c884c06
commit 55a36a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/runtime/FunctionObjectInlines.h b/src/runtime/FunctionObjectInlines.h
@@ -130,7 +130,9 @@ class FunctionObjectProcessCallGenerator {
         if (std::is_same<FunctionObjectType, ScriptGeneratorFunctionObject>::value || std::is_same<FunctionObjectType, ScriptAsyncFunctionObject>::value || std::is_same<FunctionObjectType, ScriptAsyncGeneratorFunctionObject>::value) {
             registerFile = (Value*)CustomAllocator<Value>().allocate(registerFileSize);
         } else {
-            registerFile = (Value*)alloca((registerFileSize) * sizeof(Value));
+            // keep ByteCodeBlock pointer in registerFileBuffer
+            registerFile = (Value*)alloca((registerFileSize) * sizeof(Value) + sizeof(size_t));
+            memcpy(&registerFile[registerFileSize], &blk, sizeof(size_t));
         }
 
         Value* stackStorage = registerFile + generalRegisterSize;

diff --git a/src/runtime/ScriptSimpleFunctionObject.h b/src/runtime/ScriptSimpleFunctionObject.h
@@ -81,8 +81,11 @@ class ScriptSimpleFunctionObject : public ScriptFunctionObject {
 #endif
         );
 
-        char registerFileBuffer[sizeof(Value) * registerFileSize];
+        // keep ByteCodeBlock pointer in registerFileBuffer
+        char registerFileBuffer[sizeof(Value) * registerFileSize + sizeof(size_t)];
         Value* registerFile = reinterpret_cast<Value*>(registerFileBuffer);
+        memcpy(registerFileBuffer + sizeof(Value) * registerFileSize, &blk, sizeof(size_t));
+
         Value* stackStorage = registerFile + registerSize;
 
         ExecutionState newState(ctx, &state, &lexEnv, argc, argv, isStrict);
@@ -152,8 +155,10 @@ class ScriptSimpleFunctionObject : public ScriptFunctionObject {
 #endif
         );
 
-        char registerFileBuffer[sizeof(Value) * registerFileSize];
+        // keep ByteCodeBlock pointer in registerFileBuffer
+        char registerFileBuffer[sizeof(Value) * registerFileSize + sizeof(size_t)];
         Value* registerFile = reinterpret_cast<Value*>(registerFileBuffer);
+        memcpy(registerFileBuffer + sizeof(Value) * registerFileSize, &blk, sizeof(size_t));
         Value* stackStorage = registerFile + registerSize;
 
         ExecutionState newState(ctx, &state, &lexEnv, argc, argv, isStrict);