Skip to content

Allow reference types for pinned GC.AllocateArray() #89293

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
jkotas merged 16 commits into from
Aug 11, 2023
Merged

Allow reference types for pinned GC.AllocateArray() #89293

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d579879
Relaxing constraints of System.GC.AllocateArray<T>.
jthorborg Jul 21, 2023
5fc9157
Adding coverage of GC.AllocateArray with ref types.
jthorborg Jul 21, 2023
376fb89
Mono/NativeAOT relaxing of System.GC.AllocateArray<T>.
jthorborg Jul 21, 2023
808d582
Merge branch 'dotnet:main' into poh-allocate-array-allow-reference-types
jthorborg Jul 21, 2023
ea6de35
Relaxed GC.AllocateUninitializedArray for ref types as well.
jthorborg Jul 21, 2023
c403266
Simplifiy conditionals in AllocateUninitializedArray.
jthorborg Jul 21, 2023
30fd375
Also simplify path for NativeOAT.
jthorborg Jul 21, 2023
13fe7a1
Simplify pinning paths.
jthorborg Jul 21, 2023
3aeca6b
Revert mistake in prior refactor.
jthorborg Jul 21, 2023
2e502dc
Renaming in tests.
jthorborg Jul 21, 2023
d7dfad7
Update src/coreclr/System.Private.CoreLib/src/System/GC.CoreCLR.cs
jkotas Aug 2, 2023
3a1bca6
Apply suggestions from code review
jkotas Aug 2, 2023
4b805e5
Don't use `var` if type name doesn't exist explicitly on right-hand side
jthorborg Aug 10, 2023
f3aff36
PR feedback for using terse method tables and JIT intrinsics for GC a…
jthorborg Aug 10, 2023
349970a
Changed EmbeddedValueType and added comment.
jthorborg Aug 10, 2023
bfe62ec
Suggestions from PR feedback.
jthorborg Aug 11, 2023
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
Prev Previous commit
Next Next commit
PR feedback for using terse method tables and JIT intrinsics for GC a… 
…rray allocation that should be slightly faster.
  • Loading branch information
@jthorborg
jthorborg committed Aug 10, 2023
commit f3aff36df0cb4ca8f5fc562d8093bba37d968094
4 changes: 2 additions & 2 deletions src/coreclr/System.Private.CoreLib/src/System/GC.CoreCLR.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ public static unsafe T[] AllocateUninitializedArray<T>(int length, bool pinned =
if (pinned)
flags |= GC_ALLOC_FLAGS.GC_ALLOC_PINNED_OBJECT_HEAP;

return Unsafe.As<T[]>(AllocateNewArray(typeof(T[]).TypeHandle.Value, length, flags));
return Unsafe.As<T[]>(AllocateNewArray(RuntimeTypeHandle.ToIntPtr(typeof(T[]).TypeHandle), length, flags));
}

/// <summary>
Expand All @@ -778,7 +778,7 @@ public static T[] AllocateArray<T>(int length, bool pinned = false) // T[] rathe
flags = GC_ALLOC_FLAGS.GC_ALLOC_PINNED_OBJECT_HEAP;
}

return Unsafe.As<T[]>(AllocateNewArray(typeof(T[]).TypeHandle.Value, length, flags));
return Unsafe.As<T[]>(AllocateNewArray(RuntimeTypeHandle.ToIntPtr(typeof(T[]).TypeHandle), length, flags));
}

[MethodImpl(MethodImplOptions.InternalCall)]
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/System/GC.NativeAot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ static T[] AllocateNewUninitializedArray(int length, bool pinned)
throw new OverflowException();

T[]? array = null;
RuntimeImports.RhAllocateNewArray(EETypePtr.EETypePtrOf<T[]>().RawValue, (uint)length, (uint)flags, Unsafe.AsPointer(ref array));
RuntimeImports.RhAllocateNewArray(MethodTable.Of<T[]>(), (uint)length, (uint)flags, Unsafe.AsPointer(ref array));
Copy link
Member

@jkotas jkotas Aug 10, 2023

Choose a reason for hiding this comment

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

Could you please also change the type of RhAllocateNewArray argument to MethodTable* to fix the build break

if (array == null)
throw new OutOfMemoryException();

Expand All @@ -857,7 +857,7 @@ public static unsafe T[] AllocateArray<T>(int length, bool pinned = false)
throw new OverflowException();

T[]? array = null;
RuntimeImports.RhAllocateNewArray(EETypePtr.EETypePtrOf<T[]>().RawValue, (uint)length, (uint)flags, Unsafe.AsPointer(ref array));
RuntimeImports.RhAllocateNewArray(MethodTable.Of<T[]>(), (uint)length, (uint)flags, Unsafe.AsPointer(ref array));
if (array == null)
throw new OutOfMemoryException();

Expand Down