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

Fix base method calls handling in scripting vtable overrides

Browse Source 
#507
This commit is contained in:
Wojtek Figat
2021-05-14 16:07:46 +02:00
parent 12aa5f0b65
commit 67aa41afb1
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -958,7 +958,7 @@ namespace Flax.Build.Bindings
contents.AppendLine();
contents.AppendLine(" {");
contents.AppendLine($" auto object = ({classInfo.NativeName}*)this;");
contents.AppendLine(" static THREADLOCAL bool IsDuringWrapperCall = false;");
contents.AppendLine(" static THREADLOCAL void* WrapperCallInstance = nullptr;");
contents.AppendLine(" ScriptingTypeHandle managedTypeHandle = object->GetTypeHandle();");
contents.AppendLine(" const ScriptingType* managedTypePtr = &managedTypeHandle.GetType();");
@@ -968,7 +968,7 @@ namespace Flax.Build.Bindings
contents.AppendLine(" managedTypePtr = &managedTypeHandle.GetType();");
contents.AppendLine(" }");
contents.AppendLine(" if (IsDuringWrapperCall)");
contents.AppendLine(" if (WrapperCallInstance == object)");
contents.AppendLine(" {");
contents.AppendLine(" // Prevent stack overflow by calling native base method");
contents.AppendLine(" const auto scriptVTableBase = managedTypePtr->Script.ScriptVTableBase;");
@@ -990,7 +990,8 @@ namespace Flax.Build.Bindings
contents.AppendLine(" PROFILE_CPU_NAMED(*method->ProfilerName);");
contents.AppendLine(" MonoObject* exception = nullptr;");
contents.AppendLine(" IsDuringWrapperCall = true;");
contents.AppendLine(" auto prevWrapperCallInstance = WrapperCallInstance;");
contents.AppendLine(" WrapperCallInstance = object;");
contents.AppendLine("#if USE_MONO_AOT");
if (functionInfo.Parameters.Count == 0)
@@ -1064,7 +1065,7 @@ namespace Flax.Build.Bindings
}
contents.AppendLine("#endif");
contents.AppendLine(" IsDuringWrapperCall = false;");
contents.AppendLine(" WrapperCallInstance = prevWrapperCallInstance;");
contents.AppendLine(" if (exception)");
contents.AppendLine(" DebugLog::LogException(exception);");

9
Source/Tools/Flax.Build/Build/Plugins/VisualScriptingPlugin.cs
View File

@@ -44,8 +44,8 @@ namespace Flax.Build.Plugins
contents.AppendLine();
contents.AppendLine(" {");
contents.AppendLine($" auto object = ({classInfo.NativeName}*)this;");
contents.AppendLine(" static THREADLOCAL bool IsDuringWrapperCall = false;");
contents.AppendLine(" if (IsDuringWrapperCall)");
contents.AppendLine(" static THREADLOCAL void* WrapperCallInstance = nullptr;");
contents.AppendLine(" if (WrapperCallInstance == object)");
contents.AppendLine(" {");
contents.AppendLine(" // Prevent stack overflow by calling base method");
contents.AppendLine(" const auto scriptVTableBase = object->GetType().Script.ScriptVTableBase;");
@@ -78,9 +78,10 @@ namespace Flax.Build.Plugins
contents.AppendLine(" Variant* parameters = nullptr;");
}
contents.AppendLine(" IsDuringWrapperCall = true;");
contents.AppendLine(" auto prevWrapperCallInstance = WrapperCallInstance;");
contents.AppendLine(" WrapperCallInstance = object;");
contents.AppendLine($" auto __result = VisualScripting::Invoke(scriptVTable[{scriptVTableIndex}], object, Span<Variant>(parameters, {functionInfo.Parameters.Count}));");
contents.AppendLine(" IsDuringWrapperCall = false;");
contents.AppendLine(" WrapperCallInstance = prevWrapperCallInstance;");
if (!functionInfo.ReturnType.IsVoid)
{