Skip to content

Copy the NativeAOT AllocateTypeAssociatedMemory to Mono #99072

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
vargaz merged 4 commits into from
Feb 29, 2024
Merged

Copy the NativeAOT AllocateTypeAssociatedMemory to Mono #99072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f408cb4
Copy the NativeAOT AllocateTypeAssociatedMemory to Mono
MichalPetryka Feb 28, 2024
6fa09af
Update RuntimeHelpersTests.cs
MichalPetryka Feb 28, 2024
3a56da7
Update RuntimeHelpers.Mono.cs
MichalPetryka Feb 28, 2024
c9c5b29
Update RuntimeHelpers.Mono.cs
MichalPetryka Feb 28, 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
2 changes: 0 additions & 2 deletions ...Runtime/tests/System.Runtime.Tests/System/Runtime/CompilerServices/RuntimeHelpersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,15 +394,13 @@ public static void ArrayGetSubArrayCoVarianceTest()
}

[Fact]
[SkipOnMono("Not presently implemented on Mono")]
public static void AllocateTypeAssociatedMemoryInvalidArguments()
{
Assert.Throws<ArgumentException>(() => { RuntimeHelpers.AllocateTypeAssociatedMemory(null, 10); });
Assert.Throws<ArgumentOutOfRangeException>(() => { RuntimeHelpers.AllocateTypeAssociatedMemory(typeof(RuntimeHelpersTests), -1); });
}

[Fact]
[SkipOnMono("Not presently implemented on Mono")]
public static unsafe void AllocateTypeAssociatedMemoryValidArguments()
{
IntPtr memory = RuntimeHelpers.AllocateTypeAssociatedMemory(typeof(RuntimeHelpersTests), 32);
Expand Down
11 changes: 9 additions & 2 deletions src/mono/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.Mono.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.Tracing;
using System.Runtime.InteropServices;
using System.Runtime.Serialization;

namespace System.Runtime.CompilerServices
Expand Down Expand Up @@ -137,9 +138,15 @@ public static void RunModuleConstructor(ModuleHandle module)
RunModuleConstructor(module.Value);
}

public static IntPtr AllocateTypeAssociatedMemory(Type type, int size)
public static unsafe IntPtr AllocateTypeAssociatedMemory(Type type, int size)
{
throw new PlatformNotSupportedException();
if (type is not RuntimeType)
throw new ArgumentException(SR.Arg_MustBeType, nameof(type));

ArgumentOutOfRangeException.ThrowIfNegative(size);

// We don't support unloading; the memory will never be freed.
return (IntPtr)NativeMemory.AllocZeroed((uint)size);
}

[Intrinsic]
Expand Down