Merge branch 'Tencent:master' into master

ArnoChenFx · Feb 17, 2025 · e8f3387 · e8f3387
2 parents 1f4b1c5 + 0ea3ade
commit e8f3387
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/unity/Assets/core/upm/Editor/Resources/puerts/xil2cpp/Puerts_il2cpp.cpp.txt b/unity/Assets/core/upm/Editor/Resources/puerts/xil2cpp/Puerts_il2cpp.cpp.txt
@@ -2223,7 +2223,7 @@ struct JsEnvPrivate
     pesapi_env_ref envRef;
     std::mutex pendingKillRefsMutex;
     std::unordered_set<pesapi_value_ref> pendingKillRefs;
-    std::unordered_set<Il2CppObject*, std::hash<void*>, std::equal_to<void>, il2cpp::gc::Allocator<Il2CppObject*>> objectPool;
+    std::unordered_set<Il2CppObject*, std::hash<void*>, std::equal_to<void*>, il2cpp::gc::Allocator<Il2CppObject*>> objectPool;
 
     JsEnvPrivate(struct pesapi_ffi* inApis, pesapi_env_ref inEnvRef)
         : apis(inApis), envRef(inEnvRef)

diff --git a/unity/Assets/core/upm/Editor/Resources/puerts/xil2cpp/TDataTrans.h.txt b/unity/Assets/core/upm/Editor/Resources/puerts/xil2cpp/TDataTrans.h.txt
@@ -545,7 +545,7 @@ struct MethodInfoHelper
 {
 };
 
-Il2CppMethodPointer GetMethodPointer(const MethodInfo* method);
+static Il2CppMethodPointer GetMethodPointer(const MethodInfo* method);
 
 template <class _Ret, class... _Args>
 struct MethodInfoHelper<_Ret (_Args...)>

diff --git a/unity/native_src/Src/JSEngine.cpp b/unity/native_src/Src/JSEngine.cpp
@@ -210,6 +210,12 @@ namespace PUERTS_NAMESPACE
 #ifdef WITH_IL2CPP_OPTIMIZATION
         CppObjectMapper.UnInitialize(MainIsolate);
 #endif
+
+        for (int i = 0; i < CallbackWithFinalizeInfos.size(); ++i)
+        {
+            CallbackWithFinalizeInfos[i]->JsFunction.Reset();
+        }
+
         BackendEnv.UnInitialize();
 
         for (int i = 0; i < CallbackInfos.size(); ++i)

diff --git a/unreal/Puerts/Source/JsEnv/Public/JsObject.h b/unreal/Puerts/Source/JsEnv/Public/JsObject.h
@@ -49,6 +49,8 @@ struct FJsObject
 #ifdef THREAD_SAFE
         v8::Locker Locker(Isolate);
 #endif
+        v8::Isolate::Scope IsolateScope(Isolate);
+        v8::HandleScope HandleScope(Isolate);
         GContext.Reset(Isolate, InOther.GContext.Get(Isolate));
         GObject.Reset(Isolate, InOther.GObject.Get(Isolate));
         JsEnvLifeCycleTracker = PUERTS_NAMESPACE::DataTransfer::GetJsEnvLifeCycleTracker(Isolate);
@@ -96,6 +98,8 @@ struct FJsObject
             return *this;
         }
         Isolate = InOther.Isolate;
+        v8::Isolate::Scope IsolateScope(Isolate);
+        v8::HandleScope HandleScope(Isolate);
         GContext.Reset(Isolate, InOther.GContext.Get(Isolate));
         GObject.Reset(Isolate, InOther.GObject.Get(Isolate));
         JsEnvLifeCycleTracker = PUERTS_NAMESPACE::DataTransfer::GetJsEnvLifeCycleTracker(Isolate);