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

Do not throw for Marshal.SizeOf(typeof(delegate*<void>)) #113603

Merged
merged 1 commit into from
Mar 18, 2025
Merged

Do not throw for Marshal.SizeOf(typeof(delegate*<void>)) #113603

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 .../nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.NativeAot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ internal static int SizeOfHelper(RuntimeType t, bool throwIfNotMarshalable)
{
Debug.Assert(throwIfNotMarshalable);

if (t.IsPointer /* or IsFunctionPointer */)
if (t.IsPointer || t.IsFunctionPointer)
Copy link
Preview

Copilot AI Mar 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider removing the outdated comment fragment 'or IsFunctionPointer' since the condition now explicitly includes it, which would improve clarity.

Copilot is powered by AI, so mistakes are possible. Review output carefully before use.

return IntPtr.Size;

if (t.IsByRef || t.IsArray || t.ContainsGenericParameters)
Expand Down
6 changes: 6 additions & 0 deletions ...m.Runtime.InteropServices.UnitTests/System/Runtime/InteropServices/Marshal/SizeOfTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ public void SizeOf_Object_ReturnsExpected()
Assert.NotEqual(0, Marshal.SizeOf(typeof(SomeTestStruct)));
}

[Fact]
public unsafe void SizeOf_FunctionPointer_ReturnsExpected()
{
Assert.Equal(IntPtr.Size, Marshal.SizeOf(typeof(delegate*<void>)));
}

[Fact]
public void SizeOf_Pointer_ReturnsExpected()
{
Expand Down
Loading