Skip to content

Migrate SpanArr inline array from InvalidCSharp*.il to C# #123736

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
jkoritzinsky merged 10 commits into from
Apr 24, 2026
Merged

Migrate SpanArr inline array from InvalidCSharp*.il to C# #123736

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4d9056e
Initial plan
Copilot Jan 28, 2026
cae838c
Migrate WithRefField, WithRefStructField, and WithTypedReferenceField…
Copilot Jan 28, 2026
1529868
Migrate SpanArr ref struct inline array to C#
Copilot Jan 28, 2026
359a1bb
Migrate ByRefLike helper types and generic structs to C#
Copilot Jan 28, 2026
3940ebe
Complete removal of migrated generic types from IL
Copilot Jan 28, 2026
ab1d3f1
Move migrated types out of InvalidCSharp namespace
Copilot Jan 29, 2026
93d4d2e
Move GenericValueType_Over, GenericByRefLike_Over, and interfaces bac…
Copilot Feb 17, 2026
67bb6f5
Move helper types back to IL to fix build errors
Copilot Feb 20, 2026
1d70f6b
Move RefFields types back to IL - ref to ref struct and TypedReferenc…
Copilot Feb 20, 2026
102fe72
Revert InvalidCSharp.il (ByRefLike) to original state
Copilot Feb 21, 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
18 changes: 18 additions & 0 deletions src/tests/Loader/classloader/InlineArray/InlineArrayValid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,3 +448,21 @@ public static void InlineArrayEqualsGetHashCode_Fails()
});
}
}

[InlineArray(LengthConst)]
public ref struct SpanArr
{
private const int LengthConst = 100;
public Span<object> element;

public int Length => LengthConst;

[UnscopedRef]
public unsafe Span<object>* At(int index)
{
fixed (Span<object>* ptr = &element)
{
return ptr + index;
}
Comment thread
jkoritzinsky marked this conversation as resolved.
}
}
47 changes: 0 additions & 47 deletions src/tests/Loader/classloader/InlineArray/InvalidCSharpInlineArray.il
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,50 +85,3 @@
.field private int32 a
.field private int32 b
}

.class public sequential ansi sealed beforefieldinit SpanArr
extends [System.Runtime]System.ValueType
{
.custom instance void [System.Runtime]System.Runtime.CompilerServices.IsByRefLikeAttribute::.ctor() = (
01 00 00 00
)
.custom instance void [System.Runtime]System.Runtime.CompilerServices.InlineArrayAttribute::.ctor(int32) = (
01 00 64 00 00 00 00 00
)

.field private static literal int32 LengthConst = int32(100)
.field public valuetype [System.Runtime]System.Span`1<object> element

.method public hidebysig
instance valuetype [System.Runtime]System.Span`1<object>* At (
int32
) cil managed
{
.locals init (
[0] valuetype [System.Runtime]System.Span`1<object>& pinned
)
ldarg.0
ldflda valuetype [System.Runtime]System.Span`1<object> SpanArr::element
stloc.0
ldloc.0
conv.u
ldarg.1
conv.i
sizeof valuetype [System.Runtime]System.Span`1<object>
mul
add
ret
}

.method public hidebysig specialname
instance int32 get_Length () cil managed
{
ldc.i4.s 100
ret
}

.property instance int32 Length()
{
.get instance int32 SpanArr::get_Length()
}
}
100 changes: 46 additions & 54 deletions src/tests/Loader/classloader/generics/ByRefLike/InvalidCSharp.il
View file
Open in desktop
Comment thread
jkoritzinsky marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -395,42 +395,20 @@
}
}

.class public sequential ansi sealed beforefieldinit InvalidCSharp.GenericClass_WithStaticField`1<byreflike T>
extends [System.Runtime]System.Object
.class interface public auto ansi abstract InvalidCSharp.SimpleInterface
{
.method public hidebysig specialname rtspecialname
instance void .ctor () cil managed
.method public hidebysig newslot abstract virtual
instance int32 Method() cil managed
{
.locals init (
[0] !T,
[1] !T
)

ldarg.0
call instance void [System.Runtime]System.Object::.ctor()

ldloca.s 0
initobj !T

ldloc.0
stsfld !0 class InvalidCSharp.GenericClass_WithStaticField`1<!T>::StaticField
ldsfld !0 class InvalidCSharp.GenericClass_WithStaticField`1<!T>::StaticField
stloc.1
ret
}

.field public static class InvalidCSharp.GenericClass_Over`1<!T> StaticField1
.field public static !T StaticField
}

.class public sequential ansi sealed beforefieldinit InvalidCSharp.GenericClass_IndependentConstraints`2<byreflike T, (!T) U>
extends [System.Runtime]System.Object
.class interface public auto ansi abstract InvalidCSharp.DefaultInterface
{
.method public hidebysig specialname rtspecialname
instance void .ctor () cil managed
.method public hidebysig newslot virtual
instance int32 Method() cil managed
{
ldarg.0
call instance void [System.Runtime]System.Object::.ctor()
ldc.i4.0
ret
}
}
Expand All @@ -451,22 +429,6 @@
)
}

.class public sequential ansi sealed beforefieldinit ByRefLikeType`1<T>
extends [System.Runtime]System.ValueType
{
.custom instance void [System.Runtime]System.Runtime.CompilerServices.IsByRefLikeAttribute::.ctor() = (
01 00 00 00
)
}

.class interface public auto ansi abstract InvalidCSharp.SimpleInterface
{
.method public hidebysig newslot abstract virtual
instance int32 Method() cil managed
{
}
}

.class public sequential ansi sealed beforefieldinit ByRefLikeTypeWithInterface
extends [System.Runtime]System.ValueType
implements InvalidCSharp.SimpleInterface
Expand All @@ -483,14 +445,9 @@
}
}

.class interface public auto ansi abstract InvalidCSharp.DefaultInterface
.class public sequential ansi sealed beforefieldinit RegularValueType
extends [System.Runtime]System.ValueType
{
.method public hidebysig newslot virtual
instance int32 Method() cil managed
{
ldc.i4.0
ret
}
}

.class public sequential ansi sealed beforefieldinit RS_DI1
Expand Down Expand Up @@ -518,9 +475,44 @@
}
}

.class public sequential ansi sealed beforefieldinit RegularValueType
extends [System.Runtime]System.ValueType
.class public sequential ansi sealed beforefieldinit InvalidCSharp.GenericClass_WithStaticField`1<byreflike T>
extends [System.Runtime]System.Object
{
.method public hidebysig specialname rtspecialname
instance void .ctor () cil managed
{
.locals init (
[0] !T,
[1] !T
)

ldarg.0
call instance void [System.Runtime]System.Object::.ctor()

ldloca.s 0
initobj !T

ldloc.0
stsfld !0 class InvalidCSharp.GenericClass_WithStaticField`1<!T>::StaticField
ldsfld !0 class InvalidCSharp.GenericClass_WithStaticField`1<!T>::StaticField
stloc.1
ret
}

.field public static class InvalidCSharp.GenericClass_Over`1<!T> StaticField1
.field public static !T StaticField
}

.class public sequential ansi sealed beforefieldinit InvalidCSharp.GenericClass_IndependentConstraints`2<byreflike T, (!T) U>
extends [System.Runtime]System.Object
{
.method public hidebysig specialname rtspecialname
instance void .ctor () cil managed
{
ldarg.0
call instance void [System.Runtime]System.Object::.ctor()
ret
}
}

.class public auto ansi beforefieldinit ClassWithInterface
Expand Down
Loading