Store unhandled exception info on stack in Native AOT (#84871)

Allocates a span on the stack to hold the ToString of the exception, as well as a CrashRecord which contains a unique cookie that can be used to find the exception info. Fixes #84636
dotnet · Apr 27, 2023 · 5d65dd6 · 5d65dd6
1 parent 75c855e
commit 5d65dd6
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 449 deletions.
diff --git a/src/coreclr/nativeaot/Runtime/threadstore.cpp b/src/coreclr/nativeaot/Runtime/threadstore.cpp
@@ -505,60 +505,4 @@ void ThreadStore::SaveCurrentThreadOffsetForDAC()
 {
 }
 
-#endif // _WIN32
-
-
-#ifndef DACCESS_COMPILE
-
-// internal static extern unsafe bool RhGetExceptionsForCurrentThread(Exception[] outputArray, out int writtenCountOut);
-COOP_PINVOKE_HELPER(FC_BOOL_RET, RhGetExceptionsForCurrentThread, (Array* pOutputArray, int32_t* pWrittenCountOut))
-{
-    FC_RETURN_BOOL(GetThreadStore()->GetExceptionsForCurrentThread(pOutputArray, pWrittenCountOut));
-}
-
-bool ThreadStore::GetExceptionsForCurrentThread(Array* pOutputArray, int32_t* pWrittenCountOut)
-{
-    int32_t countWritten = 0;
-    Object** pArrayElements;
-    Thread * pThread = GetCurrentThread();
-
-    for (PTR_ExInfo pInfo = pThread->m_pExInfoStackHead; pInfo != NULL; pInfo = pInfo->m_pPrevExInfo)
-    {
-        if (pInfo->m_exception == NULL)
-            continue;
-
-        countWritten++;
-    }
-
-    // No input array provided, or it was of the wrong kind.  We'll fill out the count and return false.
-    if ((pOutputArray == NULL) || (pOutputArray->get_EEType()->RawGetComponentSize() != POINTER_SIZE))
-        goto Error;
-
-    // Input array was not big enough.  We don't even partially fill it.
-    if (pOutputArray->GetArrayLength() < (uint32_t)countWritten)
-        goto Error;
-
-    *pWrittenCountOut = countWritten;
-
-    // Success, but nothing to report.
-    if (countWritten == 0)
-        return true;
-
-    pArrayElements = (Object**)pOutputArray->GetArrayData();
-    for (PTR_ExInfo pInfo = pThread->m_pExInfoStackHead; pInfo != NULL; pInfo = pInfo->m_pPrevExInfo)
-    {
-        if (pInfo->m_exception == NULL)
-            continue;
-
-        *pArrayElements = pInfo->m_exception;
-        pArrayElements++;
-    }
-
-    RhpBulkWriteBarrier(pArrayElements, countWritten * POINTER_SIZE);
-    return true;
-
-Error:
-    *pWrittenCountOut = countWritten;
-    return false;
-}
-#endif // DACCESS_COMPILE
+#endif // _WIN32
diff --git a/src/coreclr/nativeaot/Runtime/threadstore.h b/src/coreclr/nativeaot/Runtime/threadstore.h
@@ -59,7 +59,6 @@ class ThreadStore
 #else
     static PTR_Thread       GetThreadFromTEB(TADDR pvTEB);
 #endif
-    bool                    GetExceptionsForCurrentThread(Array* pOutputArray, int32_t* pWrittenCountOut);
 
     void        Destroy();
     void        SuspendAllThreads(bool waitForGCEvent);

diff --git a/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/RuntimeImports.cs b/src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/RuntimeImports.cs
@@ -599,10 +599,6 @@ internal static IntPtr RhGetModuleSection(TypeManagerHandle module, ReadyToRunSe
         internal static extern unsafe int RhGetModuleFileName(IntPtr moduleHandle, out char* moduleName);
 #endif
 
-        [MethodImplAttribute(MethodImplOptions.InternalCall)]
-        [RuntimeImport(RuntimeLibrary, "RhGetExceptionsForCurrentThread")]
-        internal static extern unsafe bool RhGetExceptionsForCurrentThread(Exception[] outputArray, out int writtenCountOut);
-
         // returns the previous value.
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         [RuntimeImport(RuntimeLibrary, "RhSetErrorInfoBuffer")]