Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[C#] Fix VariantUtils.ConvertTo<T> #92572

Closed
wants to merge 1 commit into from
Closed

[C#] Fix VariantUtils.ConvertTo<T> #92572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/mono/glue/GodotSharp/GodotSharp/Core/Array.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,7 +1415,7 @@ public unsafe T this[int index]
get
{
_underlyingArray.GetVariantBorrowElementAt(index, out godot_variant borrowElem);
return VariantUtils.ConvertTo<T>(borrowElem);
return VariantUtils.ConvertTo<T>(borrowElem, false);
}
set
{
Expand Down
4 changes: 2 additions & 2 deletions modules/mono/glue/GodotSharp/GodotSharp/Core/Dictionary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ public TValue this[TKey key]
variantKey, out godot_variant value).ToBool())
{
using (value)
return VariantUtils.ConvertTo<TValue>(value);
return VariantUtils.ConvertTo<TValue>(value, false);
}
else
{
Expand Down Expand Up @@ -707,7 +707,7 @@ private KeyValuePair<TKey, TValue> GetKeyValuePair(int index)
{
return new KeyValuePair<TKey, TValue>(
VariantUtils.ConvertTo<TKey>(key),
VariantUtils.ConvertTo<TValue>(value));
VariantUtils.ConvertTo<TValue>(value, false));
}
}

Expand Down
18 changes: 17 additions & 1 deletion modules/mono/glue/GodotSharp/GodotSharp/Core/NativeInterop/VariantUtils.generic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,12 @@ public static godot_variant CreateFrom<[MustBeVariant] T>(in T from)

[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
public static T ConvertTo<[MustBeVariant] T>(in godot_variant variant)
{
return ConvertTo<T>(in variant, true);
}

[MethodImpl(MethodImplOptions.AggressiveInlining | MethodImplOptions.AggressiveOptimization)]
public static T ConvertTo<[MustBeVariant] T>(in godot_variant variant, bool directCast)
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
static T UnsafeAsT<TFrom>(TFrom f) => Unsafe.As<TFrom, T>(ref Unsafe.AsRef(f));
Expand Down Expand Up @@ -384,7 +390,17 @@ public static T ConvertTo<[MustBeVariant] T>(in godot_variant variant)
// `typeof(X).IsAssignableFrom(typeof(T))` is optimized away

if (typeof(GodotObject).IsAssignableFrom(typeof(T)))
return (T)(object)ConvertToGodotObject(variant);
{
var godotObject = (object)ConvertToGodotObject(variant);

if (directCast)
return (T)godotObject;

if (godotObject is T go)
return go;

return default!;
}

// `typeof(T).IsValueType` is optimized away
// `typeof(T).IsEnum` is NOT optimized away: https://github.com/dotnet/runtime/issues/67113
Expand Down
6 changes: 5 additions & 1 deletion modules/mono/glue/GodotSharp/GodotSharp/Core/Variant.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,13 @@ public void Dispose()
public static Variant From<[MustBeVariant] T>(in T from) =>
CreateTakingOwnershipOfDisposableValue(VariantUtils.CreateFrom(from));

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public T Cast<[MustBeVariant] T>() where T : GodotObject =>
VariantUtils.ConvertTo<T>(NativeVar.DangerousSelfRef, true);

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public T As<[MustBeVariant] T>() =>
VariantUtils.ConvertTo<T>(NativeVar.DangerousSelfRef);
VariantUtils.ConvertTo<T>(NativeVar.DangerousSelfRef, false);

[MethodImpl(MethodImplOptions.AggressiveInlining)]
public bool AsBool() =>
Expand Down
Loading