Fix variadic generics generation

Make sure the created `NativeGodotVariant` is stored in a local variable so it doesn't go out of scope while using it.
raulsntos · May 18, 2024 · 4291d4c · 4291d4c
1 parent afabeae
commit 4291d4c
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/src/Godot.BindingsGenerator/BindingsDataCollectors/VariadicGenericsBindingsDataCollector.cs b/src/Godot.BindingsGenerator/BindingsDataCollectors/VariadicGenericsBindingsDataCollector.cs
@@ -49,13 +49,18 @@ public override void Populate(BindingsData.CollectionContext context)
                         return;
                     }
 
+                    for (int i = 0; i < genericTypeArgumentCount; i++)
+                    {
+                        writer.WriteLine($"global::Godot.NativeInterop.NativeGodotVariant __arg{i} = global::Godot.NativeInterop.Marshalling.ConvertToVariant<T{i}>(in parameter{i});");
+                    }
+
                     writer.WriteLine($"global::Godot.NativeInterop.NativeGodotVariant** args = stackalloc global::Godot.NativeInterop.NativeGodotVariant*[{genericTypeArgumentCount}]");
                     writer.WriteLine('{');
                     writer.Indent++;
 
                     for (int i = 0; i < genericTypeArgumentCount; i++)
                     {
-                        writer.WriteLine($"global::Godot.NativeInterop.Marshalling.ConvertToVariant<T{i}>(in parameter{i}).GetUnsafeAddress(),");
+                        writer.WriteLine($"__arg{i}.GetUnsafeAddress(),");
                     }
 
                     writer.Indent--;
@@ -98,14 +103,18 @@ public override void Populate(BindingsData.CollectionContext context)
                     }
                     else
                     {
+                        for (int i = 0; i < genericTypeArgumentCount; i++)
+                        {
+                            writer.WriteLine($"global::Godot.NativeInterop.NativeGodotVariant __arg{i} = global::Godot.NativeInterop.Marshalling.ConvertToVariant<T{i}>(in parameter{i});");
+                        }
 
                         writer.WriteLine($"global::Godot.NativeInterop.NativeGodotVariant** args = stackalloc global::Godot.NativeInterop.NativeGodotVariant*[{genericTypeArgumentCount}]");
                         writer.WriteLine('{');
                         writer.Indent++;
 
                         for (int i = 0; i < genericTypeArgumentCount; i++)
                         {
-                            writer.WriteLine($"global::Godot.NativeInterop.Marshalling.ConvertToVariant<T{i}>(in parameter{i}).GetUnsafeAddress(),");
+                            writer.WriteLine($"__arg{i}.GetUnsafeAddress(),");
                         }
 
                         writer.Indent--;
@@ -153,13 +162,18 @@ public override void Populate(BindingsData.CollectionContext context)
                         return;
                     }
 
+                    for (int i = 0; i < genericTypeArgumentCount; i++)
+                    {
+                        writer.WriteLine($"global::Godot.NativeInterop.NativeGodotVariant __arg{i} = global::Godot.NativeInterop.Marshalling.ConvertToVariant<T{i}>(in parameter{i});");
+                    }
+
                     writer.WriteLine($"global::Godot.NativeInterop.NativeGodotVariant** args = stackalloc global::Godot.NativeInterop.NativeGodotVariant*[{genericTypeArgumentCount}]");
                     writer.WriteLine('{');
                     writer.Indent++;
 
                     for (int i = 0; i < genericTypeArgumentCount; i++)
                     {
-                        writer.WriteLine($"global::Godot.NativeInterop.Marshalling.ConvertToVariant<T{i}>(in parameter{i}).GetUnsafeAddress(),");
+                        writer.WriteLine($"__arg{i}.GetUnsafeAddress(),");
                     }
 
                     writer.Indent--;
@@ -198,13 +212,18 @@ public override void Populate(BindingsData.CollectionContext context)
                     }
                     else
                     {
+                        for (int i = 0; i < genericTypeArgumentCount; i++)
+                        {
+                            writer.WriteLine($"global::Godot.NativeInterop.NativeGodotVariant __arg{i} = global::Godot.NativeInterop.Marshalling.ConvertToVariant<T{i}>(in parameter{i});");
+                        }
+
                         writer.WriteLine($"global::Godot.NativeInterop.NativeGodotVariant** args = stackalloc global::Godot.NativeInterop.NativeGodotVariant*[{genericTypeArgumentCount}]");
                         writer.WriteLine('{');
                         writer.Indent++;
 
                         for (int i = 0; i < genericTypeArgumentCount; i++)
                         {
-                            writer.WriteLine($"global::Godot.NativeInterop.Marshalling.ConvertToVariant<T{i}>(in parameter{i}).GetUnsafeAddress(),");
+                            writer.WriteLine($"__arg{i}.GetUnsafeAddress(),");
                         }
 
                         writer.Indent--;