[NativeAOT] Reflection Invoke refactoring

src/coreclr/nativeaot/Runtime/GCHelpers.cpp

@@ -352,3 +352,23 @@ COOP_PINVOKE_HELPER(int64_t, RhGetTotalPauseDuration, ())
 {
     return GCHeapUtilities::GetGCHeap()->GetTotalPauseDuration();
 }
+
+COOP_PINVOKE_HELPER(void, RhRegisterForGCReporting, (GCFrameRegistration* pRegistration))
+{
+    Thread* pThread = ThreadStore::GetCurrentThread();
+
+    ASSERT(pRegistration->m_pThread == NULL);
+    pRegistration->m_pThread = pThread;
+
+    pThread->PushGCFrameRegistration(pRegistration);
+}
+
+COOP_PINVOKE_HELPER(void, RhUnregisterForGCReporting, (GCFrameRegistration* pRegistration))
+{
+    Thread* pThread = pRegistration->m_pThread;
+    if (pThread == NULL)
+        return;
+
+    ASSERT(pThread == ThreadStore::GetCurrentThread());
+    pThread->PopGCFrameRegistration(pRegistration);
+}

src/coreclr/nativeaot/Runtime/thread.cpp

@@ -251,9 +251,6 @@ void Thread::Construct()
              (offsetof(Thread, m_pTransitionFrame)));
 #endif // USE_PORTABLE_HELPERS
 
-    m_pThreadLocalModuleStatics = NULL;
-    m_numThreadLocalModuleStatics = 0;
-
     // NOTE: We do not explicitly defer to the GC implementation to initialize the alloc_context.  The
     // alloc_context will be initialized to 0 via the static initialization of tls_CurrentThread. If the
     // alloc_context ever needs different initialization, a matching change to the tls_CurrentThread
@@ -281,12 +278,19 @@ void Thread::Construct()
         m_pThreadStressLog = StressLog::CreateThreadStressLog(this);
 #endif // STRESS_LOG
 
-    m_threadAbortException = NULL;
+    // Everything else should be initialized to 0 via the static initialization of tls_CurrentThread.
+
+    ASSERT(m_pThreadLocalModuleStatics == NULL);
+    ASSERT(m_numThreadLocalModuleStatics == 0);
+
+    ASSERT(m_pGCFrameRegistrations == NULL);
+
+    ASSERT(m_threadAbortException == NULL);
 
 #ifdef FEATURE_SUSPEND_REDIRECTION
-    m_redirectionContextBuffer = NULL;
+    ASSERT(m_redirectionContextBuffer == NULL);
 #endif //FEATURE_SUSPEND_REDIRECTION
-    m_interruptedContext = NULL;
+    ASSERT(m_interruptedContext == NULL);
 }
 
 bool Thread::IsInitialized()
@@ -370,6 +374,8 @@ void Thread::Destroy()
         delete[] m_redirectionContextBuffer;
     }
 #endif //FEATURE_SUSPEND_REDIRECTION
+
+    ASSERT(m_pGCFrameRegistrations == NULL);
 }
 
 #ifdef HOST_WASM
@@ -536,6 +542,17 @@ void Thread::GcScanRootsWorker(void * pfnEnumCallback, void * pvCallbackData, St
         RedhawkGCInterface::EnumGcRef(pExceptionObj, GCRK_Object, pfnEnumCallback, pvCallbackData);
     }
 
+    for (GCFrameRegistration* pCurGCFrame = m_pGCFrameRegistrations; pCurGCFrame != NULL; pCurGCFrame = pCurGCFrame->m_pNext)
+    {
+        ASSERT(pCurGCFrame->m_pThread == this);
+
+        for (uint32_t i = 0; i < pCurGCFrame->m_numObjRefs; i++)
+        {
+            RedhawkGCInterface::EnumGcRef(dac_cast<PTR_RtuObjectRef>(pCurGCFrame->m_pObjRefs + i),
+                pCurGCFrame->m_MaybeInterior ? GCRK_Byref : GCRK_Object, pfnEnumCallback, pvCallbackData);
+        }
+    }
+
     // Keep alive the ThreadAbortException that's stored in the target thread during thread abort
     PTR_RtuObjectRef pThreadAbortExceptionObj = dac_cast<PTR_RtuObjectRef>(&m_threadAbortException);
     RedhawkGCInterface::EnumGcRef(pThreadAbortExceptionObj, GCRK_Object, pfnEnumCallback, pvCallbackData);

src/coreclr/nativeaot/Runtime/thread.h

@@ -66,6 +66,15 @@ struct ExInfo
     volatile void*          m_notifyDebuggerSP;
 };
 
+struct GCFrameRegistration
+{
+    Thread* m_pThread;
+    GCFrameRegistration* m_pNext;
+    void** m_pObjRefs;
+    uint32_t m_numObjRefs;
+    int m_MaybeInterior;
+};
+
 struct ThreadBuffer
 {
     uint8_t                 m_rgbAllocContextBuffer[SIZEOF_ALLOC_CONTEXT];
@@ -82,6 +91,7 @@ struct ThreadBuffer
     Object*                 m_threadAbortException;                 // ThreadAbortException instance -set only during thread abort
     PTR_PTR_VOID            m_pThreadLocalModuleStatics;
     uint32_t                m_numThreadLocalModuleStatics;
+    GCFrameRegistration*    m_pGCFrameRegistrations;
     PTR_VOID                m_pStackLow;
     PTR_VOID                m_pStackHigh;
     PTR_UInt8               m_pTEB;                                 // Pointer to OS TEB structure for this thread
@@ -274,6 +284,9 @@ class Thread : private ThreadBuffer
 
     NATIVE_CONTEXT* GetInterruptedContext();
 
+    void PushGCFrameRegistration(GCFrameRegistration* pRegistration);
+    void PopGCFrameRegistration(GCFrameRegistration* pRegistration);
+
 #ifdef FEATURE_SUSPEND_REDIRECTION
     NATIVE_CONTEXT* EnsureRedirectionContext();
 #endif //FEATURE_SUSPEND_REDIRECTION

src/coreclr/nativeaot/Runtime/thread.inl

@@ -41,3 +41,15 @@ inline PTR_VOID Thread::GetThreadStressLog() const
 {
     return m_pThreadStressLog;
 }
+
+inline void Thread::PushGCFrameRegistration(GCFrameRegistration* pRegistration)
+{
+    pRegistration->m_pNext = m_pGCFrameRegistrations;
+    m_pGCFrameRegistrations = pRegistration;
+}
+
+inline void Thread::PopGCFrameRegistration(GCFrameRegistration* pRegistration)
+{
+    ASSERT(m_pGCFrameRegistrations == pRegistration);
+    m_pGCFrameRegistrations = pRegistration->m_pNext;
+}

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Augments/ReflectionAugments.cs

@@ -167,6 +167,6 @@ public abstract object ActivatorCreateInstance(
 
         public abstract EnumInfo GetEnumInfo(Type type);
 
-        public abstract DelegateDynamicInvokeInfo GetDelegateDynamicInvokeInfo(Type type);
+        public abstract DynamicInvokeInfo GetDelegateDynamicInvokeInfo(Type type);
     }
 }

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Reflection/Core/Execution/ExecutionEnvironment.cs

@@ -98,7 +98,7 @@ public abstract class ExecutionEnvironment
         //==============================================================================================
         public abstract FieldAccessor CreateLiteralFieldAccessor(object value, RuntimeTypeHandle fieldTypeHandle);
         public abstract EnumInfo GetEnumInfo(RuntimeTypeHandle typeHandle);
-        public abstract IntPtr GetDynamicInvokeThunk(MethodInvoker invoker, out IntPtr genericDictionary);
+        public abstract IntPtr GetDynamicInvokeThunk(MethodInvoker invoker);
 
         //==============================================================================================
         // Non-public methods

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/Augments/RuntimeAugments.cs

@@ -360,32 +360,6 @@ public static int GetHighestStaticThreadStaticIndex(TypeManagerHandle typeManage
 
         public static unsafe int ObjectHeaderSize => sizeof(EETypePtr);
 
-        [DebuggerGuidedStepThroughAttribute]
-        public static object? CallDynamicInvokeMethod(
-            object? thisPtr,
-            IntPtr methodToCall,
-            IntPtr dynamicInvokeHelperMethod,
-            IntPtr dynamicInvokeHelperGenericDictionary,
-            MethodBase targetMethod,
-            object?[]? parameters,
-            BinderBundle binderBundle,
-            bool wrapInTargetInvocationException,
-            bool methodToCallIsThisCall)
-        {
-            object? result = InvokeUtils.CallDynamicInvokeMethod(
-                thisPtr,
-                methodToCall,
-                dynamicInvokeHelperMethod,
-                dynamicInvokeHelperGenericDictionary,
-                targetMethod,
-                parameters,
-                binderBundle,
-                wrapInTargetInvocationException,
-                methodToCallIsThisCall);
-            System.Diagnostics.DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
-            return result;
-        }
-
         public static unsafe void EnsureClassConstructorRun(IntPtr staticClassConstructionContext)
         {
             StaticClassConstructionContext* context = (StaticClassConstructionContext*)staticClassConstructionContext;
@@ -712,7 +686,7 @@ public static bool CanPrimitiveWiden(RuntimeTypeHandle srcType, RuntimeTypeHandl
 
         public static object CheckArgument(object srcObject, RuntimeTypeHandle dstType, BinderBundle binderBundle)
         {
-            return InvokeUtils.CheckArgument(srcObject, dstType, binderBundle);
+            return InvokeUtils.CheckArgument(srcObject, dstType.ToEETypePtr(), InvokeUtils.CheckArgumentSemantics.DynamicInvoke, binderBundle);
         }
 
         // FieldInfo.SetValueDirect() has a completely different set of rules on how to coerce the argument from

src/coreclr/nativeaot/System.Private.CoreLib/src/Internal/Runtime/CompilerHelpers/ThrowHelpers.cs

@@ -127,10 +127,5 @@ public static void ThrowArgumentOutOfRangeException()
         {
             throw new ArgumentOutOfRangeException();
         }
-
-        public static void ThrowInvokeNullRefReturned()
-        {
-            throw new NullReferenceException(SR.NullReference_InvokeNullRefReturned);
-        }
     }
 }

src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj

@@ -136,7 +136,7 @@
     <Compile Include="System\Reflection\Attribute.NativeAot.cs" />
     <Compile Include="System\Reflection\Assembly.NativeAot.cs" />
     <Compile Include="System\Reflection\BinderBundle.cs" />
-    <Compile Include="System\Reflection\DelegateDynamicInvokeInfo.cs" />
+    <Compile Include="System\Reflection\DynamicInvokeInfo.cs" />
     <Compile Include="System\Reflection\Emit\AssemblyBuilder.cs" />
     <Compile Include="System\Reflection\Emit\ConstructorBuilder.cs" />
     <Compile Include="System\Reflection\Emit\CustomAttributeBuilder.cs" />

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Delegate.cs

@@ -276,10 +276,9 @@ internal bool IsDynamicDelegate()
             }
             else
             {
-                DelegateDynamicInvokeInfo invokeInfo = ReflectionAugments.ReflectionCoreCallbacks.GetDelegateDynamicInvokeInfo(GetType());
+                DynamicInvokeInfo dynamicInvokeInfo = ReflectionAugments.ReflectionCoreCallbacks.GetDelegateDynamicInvokeInfo(GetType());
 
-                object? result = InvokeUtils.CallDynamicInvokeMethod(m_firstParameter, m_functionPointer,
-                    invokeInfo.InvokeThunk, invokeInfo.GenericDictionary, invokeInfo.InvokeMethod,
+                object? result = dynamicInvokeInfo.Invoke(m_firstParameter, m_functionPointer,
                     args, binderBundle: null, wrapInTargetInvocationException: true);
                 DebugAnnotations.PreviousCallContainsDebuggerStepInCode();
                 return result;