Complete thread abort support for the new EH (#95616)

* Complete thread abort support for the new EH

This change adds all the necessary changes to make thread abort
work with the new exception handling.

* Fix build warning

Author: janvorli

src/coreclr/vm/excep.cpp

@@ -6599,6 +6599,8 @@ void HandleManagedFaultNew(EXCEPTION_RECORD* pExceptionRecord, CONTEXT* pContext
     args[ARGNUM_0] = DWORD_TO_ARGHOLDER(exceptionCode);
     args[ARGNUM_1] = PTR_TO_ARGHOLDER(&exInfo);
 
+    pThread->IncPreventAbort();
+
     //Ex.RhThrowHwEx(exceptionCode, &exInfo)
     CALL_MANAGED_METHOD_NORET(args)
 

src/coreclr/vm/exceptionhandling.cpp

@@ -5462,6 +5462,8 @@ BOOL HandleHardwareException(PAL_SEHException* ex)
             args[ARGNUM_0] = DWORD_TO_ARGHOLDER(exceptionCode);
             args[ARGNUM_1] = PTR_TO_ARGHOLDER(&exInfo);
 
+            pThread->IncPreventAbort();
+
             //Ex.RhThrowHwEx(exceptionCode, &exInfo)
             CALL_MANAGED_METHOD_NORET(args)
 
@@ -5555,6 +5557,8 @@ VOID DECLSPEC_NORETURN DispatchManagedException(OBJECTREF throwable)
     args[ARGNUM_0] = OBJECTREF_TO_ARGHOLDER(throwable);
     args[ARGNUM_1] = PTR_TO_ARGHOLDER(&exInfo);
 
+    pThread->IncPreventAbort();
+
     //Ex.RhThrowEx(throwable, &exInfo)
     CRITICAL_CALLSITE;
     CALL_MANAGED_METHOD_NORET(args)
@@ -7559,11 +7563,13 @@ extern "C" void * QCALLTYPE CallCatchFunclet(QCall::ObjectHandleOnStack exceptio
     GCX_COOP_NO_DTOR();
 
     Thread* pThread = GET_THREAD();
+    pThread->DecPreventAbort();
+
     Frame* pFrame = pThread->GetFrame();
     MarkInlinedCallFrameAsFuncletCall(pFrame);
     HandlerFn* pfnHandler = (HandlerFn*)pHandlerIP;
     exInfo->m_sfHighBound = exInfo->m_frameIter.m_crawl.GetRegisterSet()->SP;
-    DWORD_PTR dwResumePC;
+    DWORD_PTR dwResumePC = 0;
 
     if (pHandlerIP != NULL)
     {
@@ -7643,6 +7649,29 @@ extern "C" void * QCALLTYPE CallCatchFunclet(QCall::ObjectHandleOnStack exceptio
     ExceptionTracker::UpdateNonvolatileRegisters(pvRegDisplay->pCurrentContext, pvRegDisplay, FALSE);
     if (pHandlerIP != NULL)
     {
+        CopyOSContext(pThread->m_OSContext, pvRegDisplay->pCurrentContext);
+        SetIP(pThread->m_OSContext, (PCODE)dwResumePC);
+        UINT_PTR uAbortAddr = (UINT_PTR)COMPlusCheckForAbort(dwResumePC);
+        if (uAbortAddr)
+        {
+#ifdef TARGET_AMD64
+#ifdef TARGET_UNIX
+            pvRegDisplay->pCurrentContext->Rdi = dwResumePC;
+            pvRegDisplay->pCurrentContext->Rsi = GetIP(pThread->GetAbortContext()); //How can this ever be different from dwResumePC?
+#else
+            pvRegDisplay->pCurrentContext->Rcx = dwResumePC;
+#endif
+#elif defined(TARGET_ARM) || defined(TARGET_ARM64)
+            // On ARM & ARM64, we save off the original PC in Lr. This is the same as done
+            // in HandleManagedFault for H/W generated exceptions.
+            pvRegDisplay->pCurrentContext->Lr = dwResumePC;
+#elif defined(TARGET_LOONGARCH64) || defined(TARGET_RISCV64)
+            pvRegDisplay->pCurrentContext->Ra = dwResumePC;
+#endif
+
+            SetIP(pvRegDisplay->pCurrentContext, uAbortAddr);
+        }
+
         ClrRestoreNonvolatileContext(pvRegDisplay->pCurrentContext);
     }
     else
@@ -7709,6 +7738,8 @@ extern "C" void QCALLTYPE CallFinallyFunclet(BYTE* pHandlerIP, REGDISPLAY* pvReg
     BEGIN_QCALL;
     GCX_COOP();
     Thread* pThread = GET_THREAD();
+    pThread->DecPreventAbort();
+
     Frame* pFrame = pThread->GetFrame();
     MarkInlinedCallFrameAsFuncletCall(pFrame);
     HandlerFn* pfnHandler = (HandlerFn*)pHandlerIP;
@@ -7733,6 +7764,9 @@ extern "C" void QCALLTYPE CallFinallyFunclet(BYTE* pHandlerIP, REGDISPLAY* pvReg
 #else
     DWORD_PTR dwResumePC = pfnHandler(establisherFrame, NULL);
 #endif        
+
+    pThread->IncPreventAbort();
+
     // Profiler, debugger and ETW events
     exInfo->MakeCallbacksRelatedToHandler(false, pThread, pMD, &exInfo->m_CurrentClause, (DWORD_PTR)pHandlerIP, GetSP(pvRegDisplay->pCurrentContext) );
     END_QCALL;

src/coreclr/vm/jithelpers.cpp

@@ -4317,6 +4317,8 @@ void RethrowNew()
     args[ARGNUM_0] = PTR_TO_ARGHOLDER(pActiveExInfo);
     args[ARGNUM_1] = PTR_TO_ARGHOLDER(&exInfo);
 
+    pThread->IncPreventAbort();
+
     //Ex.RhRethrow(ref ExInfo activeExInfo, ref ExInfo exInfo)
     CALL_MANAGED_METHOD_NORET(args)
     GCPROTECT_END();

src/coreclr/vm/threads.cpp

@@ -1505,6 +1505,7 @@ Thread::Thread()
 #endif  // TRACK_SYNC
 
     m_PreventAsync = 0;
+    m_PreventAbort = 0;
 #ifdef FEATURE_COMINTEROP
     m_fDisableComObjectEagerCleanup = false;
 #endif //FEATURE_COMINTEROP

src/coreclr/vm/threads.h

@@ -2829,6 +2829,29 @@ class Thread
 
     typedef StateHolder<Thread::IncPreventAsync, Thread::DecPreventAsync> ThreadPreventAsyncHolder;
 
+    // While executing the new exception handling managed code,
+    // this thread must not be aborted.
+    static void        IncPreventAbort()
+    {
+        WRAPPER_NO_CONTRACT;
+        Thread *pThread = GetThread();
+        InterlockedIncrement((LONG*)&pThread->m_PreventAbort);
+    }
+    static void        DecPreventAbort()
+    {
+        WRAPPER_NO_CONTRACT;
+        Thread *pThread = GetThread();
+#ifdef _DEBUG
+        LONG c =
+#endif // _DEBUG
+        InterlockedDecrement((LONG*)&pThread->m_PreventAbort);
+        _ASSERTE(c >= 0);
+    }
+
+    BOOL IsAbortPrevented()
+    {
+        return m_PreventAbort != 0;
+    }
     // The ThreadStore manages a list of all the threads in the system.  I
     // can't figure out how to expand the ThreadList template type without
     // making m_Link public.
@@ -3643,6 +3666,8 @@ class Thread
     // Don't allow a thread to be asynchronously stopped or interrupted (e.g. because
     // it is performing a <clinit>)
     int         m_PreventAsync;
+    // Don't allow a thread to be aborted while running the new exception handling managed code
+    int         m_PreventAbort;
 
     static LONG m_DebugWillSyncCount;
 

src/coreclr/vm/threadsuspend.cpp

@@ -955,9 +955,8 @@ BOOL Thread::ReadyForAsyncException()
     }
 
 #ifdef FEATURE_EH_FUNCLETS
-    if (g_isNewExceptionHandlingEnabled)
+    if (g_isNewExceptionHandlingEnabled && IsAbortPrevented())
     {
-        // TODO: make thread abort work for the new exception handling
         return FALSE;
     }
 #endif // FEATURE_EH_FUNCLETS