Rework RhGetRuntimeHelperForType in C# #1371
Conversation
This is required to make compile on ARM
|
You may also need to change |
Technically there no indirecion marcro left, but interesting, should I keep GenericLookupResultReferenceType as it is. Probably this is some core feature which used occasionallly to get tactical results
| [MethodImplAttribute(MethodImplOptions.InternalCall)] | ||
| [RuntimeImport(RuntimeLibrary, "RhGetRuntimeHelperForType")] | ||
| internal static extern unsafe IntPtr RhGetRuntimeHelperForType(EETypePtr pEEType, RuntimeHelperKind kind); | ||
| internal static unsafe IntPtr RhGetRuntimeHelperForType(EETypePtr pEEType, RuntimeHelperKind kind) |
There was a problem hiding this comment.
Instead of inlining this into RuntimeImports.cs, could you put the implementation as a RuntimeExport into src\coreclr\nativeaot\Runtime.Base\src\System\Runtime\RuntimeExports.cs? Use EEType* instead of EETypePtr there.
RuntimeHelperKind enum will have to move to src\coreclr\tools\Common\Internal\Runtime\RuntimeConstants.cs but that's a better spot for it.
Then you can keep this InternalCall as-is.
Maintain separation of the runtime implementation
|
Tests do not run for some reason. |
| @@ -294,7 +294,7 @@ internal override IntPtr Create(TypeBuilder builder) | |||
| internal override unsafe IntPtr CreateLazyLookupCell(TypeBuilder builder, out IntPtr auxResult) | |||
| { | |||
| auxResult = IntPtr.Zero; | |||
| return *(IntPtr*)Create(builder); | |||
There was a problem hiding this comment.
This one is still indirected.
| @@ -57,4 +57,14 @@ internal static class SpecialDispatchMapSlot | |||
| public const ushort Diamond = 0xFFFE; | |||
| public const ushort Reabstraction = 0xFFFF; | |||
| } | |||
|
|
|||
| // Keep in sync with RH\src\rtu\runtimeinstance.cpp | |||
There was a problem hiding this comment.
We only have one copy of this now - no longer need to keep in sync with anything.
| return (IntPtr)(delegate*<EEType*, object, void>)&TypeCast.CheckVectorElemAddr; | ||
|
|
||
| default: | ||
| throw new NotImplementedException(); |
There was a problem hiding this comment.
Throwing from here won't lead to anything good. Maybe assert and return IntPtr.Zero?
| @@ -450,5 +450,65 @@ public static int RhGetThunkSize() | |||
| { | |||
| return InternalCalls.RhpGetThunkSize(); | |||
| } | |||
|
|
|||
| [MethodImplAttribute(MethodImplOptions.InternalCall)] | |||
There was a problem hiding this comment.
The MethodImpl is not needed.
* Get rid of indirection in fat function pointers * Clean up after #1371 * Get rid of indirections around statics * Delete IndirectionNode
as per this discussion #1294 (comment)