修改：临时处理CacheScriptContainer的类型检测 #593

Author: xuyanghuang-tencent

Plugins/UnLua/Source/UnLua/Private/LuaCore.cpp

@@ -477,6 +477,36 @@ void* CacheScriptContainer(lua_State *L, void *Key, const FScriptContainerDesc &
     return Userdata;            // return null if container is already cached, or the new created userdata otherwise
 }
 
+
+void* CacheScriptContainer(lua_State *L, void *Key, const FScriptContainerDesc &Desc, const TFunctionRef<bool (void*)>& Validator)
+{
+    if (!Key)
+    {
+        UNLUA_LOGERROR(L, LogUnLua, Warning, TEXT("%s, Invalid key!"), ANSI_TO_TCHAR(__FUNCTION__));
+        return nullptr;
+    }
+
+    // return null if container is already cached, or create/cache/return a new ud
+    void *Userdata = nullptr;
+    lua_getfield(L, LUA_REGISTRYINDEX, "ScriptContainerMap");
+    lua_pushlightuserdata(L, Key);
+    int32 Type = lua_rawget(L, -2);
+    if (Type == LUA_TNIL || !Validator(lua_touserdata(L, -1)))
+    {
+        lua_pop(L, 1);
+
+        Userdata = NewUserdataWithContainerTag(L, Desc.GetSize());      // create new userdata
+        luaL_setmetatable(L, Desc.GetName());               // set metatable
+        lua_pushlightuserdata(L, Key);
+        lua_pushvalue(L, -2);
+        lua_rawset(L, -4);                                  // cache it in 'ScriptContainerMap'
+        UnLua::FLuaEnv::FindEnv(L)->GetDanglingCheck()->CaptureContainer(L, Key);
+    }
+
+    lua_remove(L, -2);
+    return Userdata;            // return null if container is already cached, or the new created userdata otherwise
+}
+
 /**
  * Get a script container at the given stack index
  */

Plugins/UnLua/Source/UnLua/Private/LuaCore.h

@@ -65,6 +65,7 @@ UNLUA_API void* GetCppInstanceFast(lua_State *L, int32 Index);
  */
 void* NewScriptContainer(lua_State *L, const FScriptContainerDesc &Desc);
 void* CacheScriptContainer(lua_State *L, void *Key, const FScriptContainerDesc &Desc);
+void* CacheScriptContainer(lua_State* L, void* Key, const FScriptContainerDesc& Desc, const TFunctionRef<bool (void*)>& Validator);
 void* GetScriptContainer(lua_State *L, int32 Index);
 void RemoveCachedScriptContainer(lua_State *L, void *Key);
 

Plugins/UnLua/Source/UnLua/Private/Registries/ContainerRegistry.cpp

@@ -57,25 +57,40 @@ namespace UnLua
 
     void FContainerRegistry::FindOrAdd(lua_State* L, FScriptArray* ContainerPtr, TSharedPtr<ITypeInterface> ElementType)
     {
-        void* Userdata = CacheScriptContainer(L, ContainerPtr, FScriptContainerDesc::Array);
+        void* Userdata = CacheScriptContainer(L, ContainerPtr, FScriptContainerDesc::Array, [&](void* Cached)
+        {
+            const auto Array = (FLuaArray*)Cached;
+            return Array->Inner == ElementType;
+        });
+
         if (Userdata)
             new(Userdata) FLuaArray(ContainerPtr, ElementType, FLuaArray::OwnedByOther);
     }
 
     void FContainerRegistry::FindOrAdd(lua_State* L, FScriptSet* ContainerPtr, TSharedPtr<ITypeInterface> ElementType)
     {
-        void* Userdata = CacheScriptContainer(L, ContainerPtr, FScriptContainerDesc::Set);
+        void* Userdata = CacheScriptContainer(L, ContainerPtr, FScriptContainerDesc::Set, [&](void* Cached)
+        {
+            const auto Set = (FLuaSet*)Cached;
+            return Set->ElementInterface == ElementType;
+        });
+
         if (Userdata)
             new(Userdata) FLuaSet(ContainerPtr, ElementType, FLuaSet::OwnedByOther);
     }
 
     void FContainerRegistry::FindOrAdd(lua_State* L, FScriptMap* ContainerPtr, TSharedPtr<ITypeInterface> KeyType, TSharedPtr<ITypeInterface> ValueType)
     {
-        void* Userdata = CacheScriptContainer(L, ContainerPtr, FScriptContainerDesc::Map);
+        void* Userdata = CacheScriptContainer(L, ContainerPtr, FScriptContainerDesc::Map, [&](void* Cached)
+        {
+            const auto Map = (FLuaMap*)Cached;
+            return Map->KeyInterface == KeyType && Map->ValueInterface == ValueType;
+        });
+
         if (Userdata)
             new(Userdata) FLuaMap(ContainerPtr, KeyType, ValueType, FLuaMap::OwnedByOther);
     }
-    
+
     void FContainerRegistry::Remove(const FLuaArray* Container)
     {
         const auto L = Env->GetMainState();