Skip to content

Native AOT: marshal empty array as non-null #109360

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
merged 2 commits into from
Oct 30, 2024
Merged

Native AOT: marshal empty array as non-null #109360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5206cf4
Native AOT: marshal empty array as non-null
sbomer Oct 29, 2024
21f5e49
Add smoke test for null array
sbomer Oct 30, 2024
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
7 changes: 1 addition & 6 deletions src/coreclr/tools/Common/TypeSystem/Interop/IL/Marshaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1377,16 +1377,11 @@ protected override void AllocAndTransformManagedToNative(ILCodeStream codeStream
{
ILLocalVariable vPinnedFirstElement = emitter.NewLocal(ManagedElementType.MakeByRefType(), true);

LoadManagedValue(codeStream);
codeStream.Emit(ILOpcode.ldlen);
codeStream.Emit(ILOpcode.conv_i4);
codeStream.Emit(ILOpcode.brfalse, lNullArray);

LoadManagedValue(codeStream);
codeStream.Emit(ILOpcode.call, emitter.NewToken(getArrayDataReferenceMethod));
codeStream.EmitStLoc(vPinnedFirstElement);

// Fall through. If array didn't have elements, vPinnedFirstElement is zeroinit.
// Fall through. If array is null, vPinnedFirstElement is zeroinit.
codeStream.EmitLabel(lNullArray);
codeStream.EmitLdLoc(vPinnedFirstElement);
codeStream.Emit(ILOpcode.conv_i);
Expand Down
6 changes: 6 additions & 0 deletions src/tests/nativeaot/SmokeTests/PInvoke/PInvoke.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,12 @@ private static void TestArrays()

ThrowIfNotEquals(0, CheckIncremental(arr, ArraySize), "Array marshalling failed");

int[] empty = new int[0];
ThrowIfNotEquals(0, CheckIncremental(empty, 0), "Empty array marshalling failed");

int[] nullArray = null;
ThrowIfNotEquals(1, CheckIncremental(nullArray, 0), "Null array marshalling failed");

Console.WriteLine("Testing marshalling blittable struct arrays");

Foo[] arr_foo = null;
Expand Down