Revert "Fix lookup for current Thread in async signal handler" (#122415)

Just want to run native AOT outerloop on this.

Reverts #122048

Author: MichalStrehovsky

src/coreclr/nativeaot/Runtime/CMakeLists.txt

@@ -55,12 +55,6 @@ set(COMMON_RUNTIME_SOURCES
     ${CLR_SRC_NATIVE_DIR}/minipal/xoshiro128pp.c
 )
 
-if (CLR_CMAKE_TARGET_UNIX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
-    list(APPEND COMMON_RUNTIME_SOURCES
-        ${RUNTIME_DIR}/asyncsafethreadmap.cpp
-    )
-endif()
-
 set(SERVER_GC_SOURCES
     ${GC_DIR}/gceesvr.cpp
     ${GC_DIR}/gcsvr.cpp

src/coreclr/nativeaot/Runtime/threadstore.cpp

@@ -22,8 +22,6 @@
 #include "TargetPtrs.h"
 #include "yieldprocessornormalized.h"
 #include <minipal/time.h>
-#include <minipal/thread.h>
-#include "asyncsafethreadmap.h"
 
 #include "slist.inl"
 
@@ -145,14 +143,6 @@ void ThreadStore::AttachCurrentThread(bool fAcquireThreadStoreLock)
     pAttachingThread->m_ThreadStateFlags = Thread::TSF_Attached;
 
     pTS->m_ThreadList.PushHead(pAttachingThread);
-
-#if defined(TARGET_UNIX) && !defined(TARGET_WASM)
-    if (!InsertThreadIntoAsyncSafeMap(pAttachingThread->m_threadId, pAttachingThread))
-    {
-        PalPrintFatalError("\nFailed to insert thread into async-safe map due to out of memory.\n");
-        RhFailFast();
-    }
-#endif // TARGET_UNIX && !TARGET_WASM
 }
 
 // static
@@ -198,9 +188,6 @@ void ThreadStore::DetachCurrentThread()
         pTS->m_ThreadList.RemoveFirst(pDetachingThread);
         // tidy up GC related stuff (release allocation context, etc..)
         pDetachingThread->Detach();
-#if defined(TARGET_UNIX) && !defined(TARGET_WASM)
-        RemoveThreadFromAsyncSafeMap(pDetachingThread->m_threadId, pDetachingThread);
-#endif
     }
 
     // post-mortem clean up.
@@ -365,13 +352,6 @@ EXTERN_C RuntimeThreadLocals* RhpGetThread()
     return &tls_CurrentThread;
 }
 
-#if defined(TARGET_UNIX) && !defined(TARGET_WASM)
-Thread * ThreadStore::GetCurrentThreadIfAvailableAsyncSafe()
-{
-    return (Thread*)FindThreadInAsyncSafeMap(minipal_get_current_thread_id_no_cache());
-}
-#endif // TARGET_UNIX && !TARGET_WASM
-
 #endif // !DACCESS_COMPILE
 
 #ifdef _WIN32

src/coreclr/nativeaot/Runtime/threadstore.h

@@ -47,7 +47,6 @@ class ThreadStore
     static Thread *         RawGetCurrentThread();
     static Thread *         GetCurrentThread();
     static Thread *         GetCurrentThreadIfAvailable();
-    static Thread *         GetCurrentThreadIfAvailableAsyncSafe();
     static PTR_Thread       GetSuspendingThread();
     static void             AttachCurrentThread();
     static void             AttachCurrentThread(bool fAcquireThreadStoreLock);

src/coreclr/nativeaot/Runtime/unix/PalUnix.cpp

@@ -1017,24 +1017,24 @@ static struct sigaction g_previousActivationHandler;
 
 static void ActivationHandler(int code, siginfo_t* siginfo, void* context)
 {
-    Thread* pThread = ThreadStore::GetCurrentThreadIfAvailableAsyncSafe();
-    if (pThread)
-    {
-        // Only accept activations from the current process
-        if (siginfo->si_pid == getpid()
+    // Only accept activations from the current process
+    if (siginfo->si_pid == getpid()
 #ifdef HOST_APPLE
-            // On Apple platforms si_pid is sometimes 0. It was confirmed by Apple to be expected, as the si_pid is tracked at the process level. So when multiple
-            // signals are in flight in the same process at the same time, it may be overwritten / zeroed.
-            || siginfo->si_pid == 0
+        // On Apple platforms si_pid is sometimes 0. It was confirmed by Apple to be expected, as the si_pid is tracked at the process level. So when multiple
+        // signals are in flight in the same process at the same time, it may be overwritten / zeroed.
+        || siginfo->si_pid == 0
 #endif
-            )
-        {
-            // Make sure that errno is not modified
-            int savedErrNo = errno;
-            Thread::HijackCallback((NATIVE_CONTEXT*)context, pThread);
-            errno = savedErrNo;
-        }
+        )
+    {
+        // Make sure that errno is not modified
+        int savedErrNo = errno;
+        Thread::HijackCallback((NATIVE_CONTEXT*)context, NULL);
+        errno = savedErrNo;
+    }
 
+    Thread* pThread = ThreadStore::GetCurrentThreadIfAvailable();
+    if (pThread)
+    {
         pThread->SetActivationPending(false);
     }
 

src/coreclr/pal/src/exception/signal.cpp

@@ -936,20 +936,22 @@ static void inject_activation_handler(int code, siginfo_t *siginfo, void *contex
             CONTEXTToNativeContext(&winContext, ucontext);
         }
     }
-
-    // Call the original handler when it is not ignored or default (terminate).
-    if (g_previous_activation.sa_flags & SA_SIGINFO)
-    {
-        _ASSERTE(g_previous_activation.sa_sigaction != NULL);
-        g_previous_activation.sa_sigaction(code, siginfo, context);
-    }
     else
     {
-        if (g_previous_activation.sa_handler != SIG_IGN &&
-            g_previous_activation.sa_handler != SIG_DFL)
+        // Call the original handler when it is not ignored or default (terminate).
+        if (g_previous_activation.sa_flags & SA_SIGINFO)
+        {
+            _ASSERTE(g_previous_activation.sa_sigaction != NULL);
+            g_previous_activation.sa_sigaction(code, siginfo, context);
+        }
+        else
         {
-            _ASSERTE(g_previous_activation.sa_handler != NULL);
-            g_previous_activation.sa_handler(code);
+            if (g_previous_activation.sa_handler != SIG_IGN &&
+                g_previous_activation.sa_handler != SIG_DFL)
+            {
+                _ASSERTE(g_previous_activation.sa_handler != NULL);
+                g_previous_activation.sa_handler(code);
+            }
         }
     }
 }

src/coreclr/runtime/asyncsafethreadmap.cpp

@@ -379,12 +379,6 @@ set(VM_SOURCES_WKS
     ${VM_SOURCES_GDBJIT}
 )
 
-if (CLR_CMAKE_TARGET_UNIX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
-    list(APPEND VM_SOURCES_WKS
-        ${RUNTIME_DIR}/asyncsafethreadmap.cpp
-    )
-endif()
-
 # coreclr needs to compile codeman.cpp differently depending on flavor (i.e. dll vs. static lib))
 list(REMOVE_ITEM VM_SOURCES_WKS codeman.cpp)
 
@@ -480,12 +474,6 @@ set(VM_HEADERS_WKS
     ${VM_HEADERS_GDBJIT}
 )
 
-if (CLR_CMAKE_TARGET_UNIX AND NOT CLR_CMAKE_TARGET_ARCH_WASM)
-    list(APPEND VM_HEADERS_WKS
-        ${RUNTIME_DIR}/asyncsafethreadmap.h
-    )
-endif()
-
 set(GC_SOURCES_WKS
     ${GC_SOURCES_DAC_AND_WKS_COMMON}
     ../gc/gceventstatus.cpp

src/coreclr/runtime/asyncsafethreadmap.h

@@ -861,7 +861,7 @@ IJitManager::IJitManager()
 // been stopped when we suspend the EE so they won't be touching an element that is about to be deleted.
 // However for pre-emptive mode threads, they could be stalled right on top of the element we want
 // to delete, so we need to apply the reader lock to them and wait for them to drain.
-ExecutionManager::ScanFlag ExecutionManager::GetScanFlags(Thread *pThread)
+ExecutionManager::ScanFlag ExecutionManager::GetScanFlags()
 {
     CONTRACTL {
         NOTHROW;
@@ -872,10 +872,7 @@ ExecutionManager::ScanFlag ExecutionManager::GetScanFlags(Thread *pThread)
 #if !defined(DACCESS_COMPILE)
 
 
-    if (!pThread)
-    {
-        pThread = GetThreadNULLOk();
-    }
+    Thread *pThread = GetThreadNULLOk();
 
     if (!pThread)
         return ScanNoReaderLock;
@@ -5243,24 +5240,6 @@ BOOL ExecutionManager::IsManagedCode(PCODE currentPC)
     return IsManagedCodeWorker(currentPC, &lockState);
 }
 
-//**************************************************************************
-BOOL ExecutionManager::IsManagedCodeNoLock(PCODE currentPC)
-{
-    CONTRACTL {
-        NOTHROW;
-        GC_NOTRIGGER;
-    } CONTRACTL_END;
-
-    if (currentPC == (PCODE)NULL)
-        return FALSE;
-
-    _ASSERTE(GetScanFlags() != ScanReaderLock);
-
-    // Since ScanReaderLock is not set, then we must assume that the ReaderLock is effectively taken.
-    RangeSectionLockState lockState = RangeSectionLockState::ReaderLocked;
-    return IsManagedCodeWorker(currentPC, &lockState);
-}
-
 //**************************************************************************
 NOINLINE // Make sure that the slow path with lock won't affect the fast path
 BOOL ExecutionManager::IsManagedCodeWithLock(PCODE currentPC)

src/coreclr/vm/CMakeLists.txt

@@ -2299,15 +2299,11 @@ class ExecutionManager
     };
 
     // Returns default scan flag for current thread
-    static ScanFlag GetScanFlags(Thread *pThread = NULL);
+    static ScanFlag GetScanFlags();
 
     // Returns whether currentPC is in managed code. Returns false for jump stubs on WIN64.
     static BOOL IsManagedCode(PCODE currentPC);
 
-    // Returns whether currentPC is in managed code. Returns false for jump stubs on WIN64.
-    // Does not acquire the reader lock. Caller must ensure it is safe.
-    static BOOL IsManagedCodeNoLock(PCODE currentPC);
-
     // Returns true if currentPC is ready to run codegen
     static BOOL IsReadyToRunCode(PCODE currentPC);