Skip to content

[ObjCRuntime] Enable nullability and clean up Stret. #24732

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

Merged
rolfbjarne merged 3 commits into from
Feb 19, 2026
Merged

[ObjCRuntime] Enable nullability and clean up Stret. #24732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c414752
[ObjCRuntime] Enable nullability and clean up Stret.
rolfbjarne Feb 18, 2026
dbad7bd
Update src/ObjCRuntime/Stret.cs
rolfbjarne Feb 19, 2026
1250ca6
[tests] Update expected sizes.
rolfbjarne Feb 19, 2026
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
58 changes: 49 additions & 9 deletions src/ObjCRuntime/Stret.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,21 @@
#if !RGEN
#endif

// Disable until we get around to enable + fix any issues.
#nullable disable
#nullable enable

namespace ObjCRuntime {
class Stret {
public static bool X86_64NeedStret (Type returnType, Generator generator)
/// <summary>Determines whether a return type requires x86_64 stret calling conventions.</summary>
/// <param name="returnType">The return type to inspect.</param>
/// <param name="generator">The generator context.</param>
/// <returns><see langword="true"/> if stret calling conventions are required; otherwise, <see langword="false"/>.</returns>
public static bool X86_64NeedStret (Type returnType, Generator? generator)
{
ArgumentNullException.ThrowIfNull (returnType);
#if BGENERATOR
ArgumentNullException.ThrowIfNull (generator);
#endif

Type t = returnType;

if (!t.IsValueType || t.IsEnum || IsBuiltInType (t))
Expand All @@ -48,8 +56,14 @@ public static bool X86_64NeedStret (Type returnType, Generator generator)

// IL2070: 'this' argument does not satisfy 'DynamicallyAccessedMemberTypes.PublicFields', 'DynamicallyAccessedMemberTypes.NonPublicFields' in call to 'System.Type.GetFields(BindingFlags)'. The parameter 'type' of method 'ObjCRuntime.Stret.GetValueTypeSize(Type, List<Type>, Boolean, Object)' does not have matching annotations. The source value must declare at least the same requirements as those declared on the target location it is assigned to.
[UnconditionalSuppressMessage ("", "IL2070", Justification = "Computing the size of a struct is safe, because the trimmer can't remove fields that would affect the size of a marshallable struct (it could affect marshalling behavior).")]
internal static int GetValueTypeSize (Type type, List<Type> fieldTypes, Generator generator)
internal static int GetValueTypeSize (Type type, List<Type> fieldTypes, Generator? generator)
{
ArgumentNullException.ThrowIfNull (type);
ArgumentNullException.ThrowIfNull (fieldTypes);
#if BGENERATOR
ArgumentNullException.ThrowIfNull (generator);
#endif

int size = 0;
int maxElementSize = 1;

Expand All @@ -59,8 +73,10 @@ internal static int GetValueTypeSize (Type type, List<Type> fieldTypes, Generato
#if BGENERATOR
var fieldOffset = generator.AttributeManager.GetCustomAttribute<FieldOffsetAttribute> (field);
#else
var fieldOffset = (FieldOffsetAttribute) Attribute.GetCustomAttribute (field, typeof (FieldOffsetAttribute));
var fieldOffset = (FieldOffsetAttribute?) Attribute.GetCustomAttribute (field, typeof (FieldOffsetAttribute));
#endif
if (fieldOffset is null)
throw new Exception ($"Unable to find a FieldOffset attribute on field {GetTypeName (field.DeclaringType)}.{field.Name}");
var elementSize = 0;
GetValueTypeSize (type, field.FieldType, fieldTypes, ref elementSize, ref maxElementSize, generator);
size = Math.Max (size, elementSize + fieldOffset.Value);
Expand All @@ -85,11 +101,13 @@ static int AlignAndAdd (Type original_type, int size, int add, ref int max_eleme

static bool IsBuiltInType (Type type)
{
ArgumentNullException.ThrowIfNull (type);
return IsBuiltInType (type, out var _);
}

internal static bool IsBuiltInType (Type type, out int type_size)
{
ArgumentNullException.ThrowIfNull (type);
type_size = 0;

if (type.IsNested)
Expand Down Expand Up @@ -150,8 +168,15 @@ internal static bool IsBuiltInType (Type type, out int type_size)

// IL2070: 'this' argument does not satisfy 'DynamicallyAccessedMemberTypes.PublicFields', 'DynamicallyAccessedMemberTypes.NonPublicFields' in call to 'System.Type.GetFields(BindingFlags)'. The parameter 'type' of method 'ObjCRuntime.Stret.GetValueTypeSize(Type, Type, List<Type>, Boolean, Int32&, Int32&, Object)' does not have matching annotations. The source value must declare at least the same requirements as those declared on the target location it is assigned to.
[UnconditionalSuppressMessage ("", "IL2070", Justification = "Computing the size of a struct is safe, because the trimmer can't remove fields that would affect the size of a marshallable struct (it could affect marshalling behavior).")]
static void GetValueTypeSize (Type original_type, Type type, List<Type> field_types, ref int size, ref int max_element_size, Generator generator)
static void GetValueTypeSize (Type original_type, Type type, List<Type> field_types, ref int size, ref int max_element_size, Generator? generator)
{
ArgumentNullException.ThrowIfNull (original_type);
ArgumentNullException.ThrowIfNull (type);
ArgumentNullException.ThrowIfNull (field_types);
#if BGENERATOR
ArgumentNullException.ThrowIfNull (generator);
#endif

// FIXME:
// SIMD types are not handled correctly here (they need 16-bit alignment).
// However we don't annotate those types in any way currently, so first we'd need to
Expand All @@ -168,7 +193,7 @@ static void GetValueTypeSize (Type original_type, Type type, List<Type> field_ty
#if BGENERATOR
var marshalAs = generator.AttributeManager.GetCustomAttribute<MarshalAsAttribute> (field);
#else
var marshalAs = (MarshalAsAttribute) Attribute.GetCustomAttribute (field, typeof (MarshalAsAttribute));
var marshalAs = (MarshalAsAttribute?) Attribute.GetCustomAttribute (field, typeof (MarshalAsAttribute));
#endif
if (marshalAs is null) {
GetValueTypeSize (original_type, field.FieldType, field_types, ref size, ref max_element_size, generator);
Expand All @@ -179,7 +204,10 @@ static void GetValueTypeSize (Type original_type, Type type, List<Type> field_ty
switch (marshalAs.Value) {
case UnmanagedType.ByValArray:
var types = new List<Type> ();
GetValueTypeSize (original_type, field.FieldType.GetElementType (), types, ref type_size, ref max_element_size, generator);
var elementType = field.FieldType.GetElementType ();
if (elementType is null)
throw new Exception ($"Unable to find the element type for field {GetTypeName (field.DeclaringType)}.{field.Name}");
GetValueTypeSize (original_type, elementType, types, ref type_size, ref max_element_size, generator);
multiplier = marshalAs.SizeConst;
break;
case UnmanagedType.U1:
Expand All @@ -201,15 +229,27 @@ static void GetValueTypeSize (Type original_type, Type type, List<Type> field_ty
type_size = 8;
break;
default:
throw new Exception ($"Unhandled MarshalAs attribute: {marshalAs.Value} on field {field.DeclaringType.FullName}.{field.Name}");
throw new Exception ($"Unhandled MarshalAs attribute: {marshalAs.Value} on field {GetTypeName (field.DeclaringType)}.{field.Name}");
}
field_types.Add (field.FieldType);
size = AlignAndAdd (original_type, size, type_size, ref max_element_size);
size += (multiplier - 1) * size;
}
}

static string GetTypeName (Type? type)
{
if (type is null)
return "<unknown>";

return type.FullName ?? type.Name ?? "<unknown>";
}

#if BGENERATOR
/// <summary>Determines whether the specified return type requires stret calling conventions.</summary>
/// <param name="returnType">The return type to inspect.</param>
/// <param name="generator">The generator context.</param>
/// <returns><see langword="true"/> if stret calling conventions are required; otherwise, <see langword="false"/>.</returns>
public static bool NeedStret (Type returnType, Generator generator)
{
return X86_64NeedStret (returnType, generator);
Expand Down
1 change: 1 addition & 0 deletions tests/dotnet/UnitTests/expected/iOS-MonoVM-interpreter-preservedapis.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,7 @@ Microsoft.iOS.dll:ObjCRuntime.Selector.sel_isMapped(System.IntPtr)
Microsoft.iOS.dll:ObjCRuntime.Selector.sel_registerName(System.IntPtr)
Microsoft.iOS.dll:ObjCRuntime.Stret
Microsoft.iOS.dll:ObjCRuntime.Stret.AlignAndAdd(System.Type, System.Int32, System.Int32, System.Int32&)
Microsoft.iOS.dll:ObjCRuntime.Stret.GetTypeName(System.Type)
Microsoft.iOS.dll:ObjCRuntime.Stret.GetValueTypeSize(System.Type, System.Collections.Generic.List`1<System.Type>, System.Object)
Microsoft.iOS.dll:ObjCRuntime.Stret.GetValueTypeSize(System.Type, System.Type, System.Collections.Generic.List`1<System.Type>, System.Int32&, System.Int32&, System.Object)
Microsoft.iOS.dll:ObjCRuntime.Stret.IsBuiltInType(System.Type, out System.Int32&)
Expand Down
Loading