GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix missing virtual C++ function override in C# if the thunk points to vtable index at offset=0

Browse Source
This commit is contained in:
Wojtek Figat
2022-09-14 22:14:25 +02:00
parent 0e523204d5
commit e6996ff22f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Engine/Scripting/ScriptingType.h
View File

@@ -487,8 +487,11 @@ FORCE_INLINE int32 GetVTableIndex(void** vtable, int32 entriesCount, void* func)
// where XXX is the actual vtable offset we need to read.
byte* funcJmp = *(byte*)func == 0x48 ? (byte*)func : (byte*)func + 5 + *(int32*)((byte*)func + 1);
funcJmp += 5;
if (*(funcJmp - 1) == 0xa0)
const byte op = *(funcJmp - 1);
if (op == 0xa0)
return *(int32*)funcJmp / sizeof(void*);
if (op == 0x20)
return 0;
return *(byte*)funcJmp / sizeof(void*);
#elif defined(__clang__)
// On Clang member function pointer represents the offset from the vtable begin.

2
Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
View File

@@ -1351,7 +1351,7 @@ namespace Flax.Build.Bindings
contents.AppendLine(" {");
contents.AppendLine($" {functionInfo.UniqueName}_Signature funcPtr = &{classInfo.NativeName}::{functionInfo.Name};");
contents.AppendLine(" const int32 vtableIndex = GetVTableIndex(vtable, entriesCount, *(void**)&funcPtr);");
contents.AppendLine(" if (vtableIndex > 0 && vtableIndex < entriesCount)");
contents.AppendLine(" if (vtableIndex >= 0 && vtableIndex < entriesCount)");
contents.AppendLine(" {");
contents.AppendLine($" scriptVTableBase[{scriptVTableIndex} + 2] = vtable[vtableIndex];");
for (int i = 0, count = 0; i < ScriptingLangInfos.Count; i++)