Revert "Remove main entrypoints checks"

This reverts commit 43c19bf.

Author: am11

src/coreclr/debug/daccess/dacdbiimplstackwalk.cpp

@@ -307,8 +307,8 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::UnwindStackWalkFrame(StackWalkHan
                         continue;
                     }
 
-                    // Runtime-invoked UCO entrypoint method (Environment.CallEntryPoint)
-                    if (pMD == g_pEnvironmentCallEntryPointMethodDesc)
+                    // Runtime-invoked UCO entrypoint methods (Environment.CallEntryPoint, Thread.StartCallback, GC.RunFinalizers)
+                    if (pMD == g_pEnvironmentCallEntryPointMethodDesc || pMD == g_pThreadStartCallbackMethodDesc || pMD == g_pGCRunFinalizersMethodDesc)
                     {
                         continue;
                     }
@@ -427,8 +427,8 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetStackWalkCurrentFrameInfo(Stac
                         {
                             ftResult = kManagedExceptionHandlingCodeFrame;
                         }
-                        // Runtime-invoked UCO entrypoint method (Environment.CallEntryPoint)
-                        else if (pMD == g_pEnvironmentCallEntryPointMethodDesc)
+                        // Runtime-invoked UCO entrypoint methods
+                        else if (pMD == g_pEnvironmentCallEntryPointMethodDesc || pMD == g_pThreadStartCallbackMethodDesc || pMD == g_pGCRunFinalizersMethodDesc)
                         {
                             ftResult = kRuntimeEntryPointFrame;
                         }

src/coreclr/debug/ee/controller.cpp

@@ -6776,8 +6776,10 @@ bool DebuggerStepper::IsInterestingFrame(FrameInfo * pFrame)
             return false;
         }
 
-        // Ignore runtime-invoked UCO entrypoint method (Environment.CallEntryPoint)
-        if (pFrame->md == g_pEnvironmentCallEntryPointMethodDesc)
+        // Ignore runtime-invoked UCO entrypoint methods
+        if (pFrame->md == g_pEnvironmentCallEntryPointMethodDesc ||
+            pFrame->md == g_pThreadStartCallbackMethodDesc ||
+            pFrame->md == g_pGCRunFinalizersMethodDesc)
         {
             return false;
         }

src/coreclr/inc/dacvars.h

@@ -126,6 +126,8 @@ DEFINE_DACVAR(UNKNOWN_POINTER_TYPE, dac__g_pExceptionServicesInternalCallsClass,
 DEFINE_DACVAR(UNKNOWN_POINTER_TYPE, dac__g_pStackFrameIteratorClass, ::g_pStackFrameIteratorClass)
 
 DEFINE_DACVAR(UNKNOWN_POINTER_TYPE, dac__g_pEnvironmentCallEntryPointMethodDesc, ::g_pEnvironmentCallEntryPointMethodDesc)
+DEFINE_DACVAR(UNKNOWN_POINTER_TYPE, dac__g_pThreadStartCallbackMethodDesc, ::g_pThreadStartCallbackMethodDesc)
+DEFINE_DACVAR(UNKNOWN_POINTER_TYPE, dac__g_pGCRunFinalizersMethodDesc, ::g_pGCRunFinalizersMethodDesc)
 
 DEFINE_DACVAR(PTR_SString, SString__s_Empty, SString::s_Empty)
 

src/coreclr/vm/comsynchronizable.cpp

@@ -31,8 +31,6 @@
 #include "utilcode.h"
 #endif
 
-MethodDesc* g_pThreadStartCallbackMethodDesc = nullptr;
-
 
 // For the following helpers, we make no attempt to synchronize.  The app developer
 // is responsible for managing their own race conditions.

src/coreclr/vm/debugdebugger.cpp

@@ -193,7 +193,9 @@ static StackWalkAction GetStackFramesCallback(CrawlFrame* pCf, VOID* data)
     //                       because we asked the stackwalker for it!
     MethodDesc* pFunc = pCf->GetFunction();
 
-    if (pFunc != nullptr && pFunc == g_pEnvironmentCallEntryPointMethodDesc)
+    if (pFunc != nullptr && (pFunc == g_pEnvironmentCallEntryPointMethodDesc ||
+                              pFunc == g_pThreadStartCallbackMethodDesc ||
+                              pFunc == g_pGCRunFinalizersMethodDesc))
     {
         return SWA_CONTINUE;
     }

src/coreclr/vm/eepolicy.cpp

@@ -178,9 +178,11 @@ class CallStackLogger
 
         MethodDesc* pMD = pCF->GetFunction();
 
-        // Skip Environment.CallEntryPoint so it doesn't appear in
+        // Skip runtime-invoked UCO entrypoint methods so they don't appear in
         // unhandled exception experiences.
-        if (pMD != nullptr && pMD == g_pEnvironmentCallEntryPointMethodDesc)
+        if (pMD != nullptr && (pMD == g_pEnvironmentCallEntryPointMethodDesc ||
+                               pMD == g_pThreadStartCallbackMethodDesc ||
+                               pMD == g_pGCRunFinalizersMethodDesc))
         {
             return SWA_CONTINUE;
         }

src/coreclr/vm/exceptionhandling.cpp

@@ -18,9 +18,6 @@
 #include "exinfo.h"
 #include "configuration.h"
 
-extern MethodDesc* g_pThreadStartCallbackMethodDesc;
-extern MethodDesc* g_pGCRunFinalizersMethodDesc;
-
 #if defined(TARGET_X86)
 #define USE_CURRENT_CONTEXT_IN_FILTER
 #endif // TARGET_X86

src/coreclr/vm/finalizerthread.cpp

@@ -34,8 +34,6 @@ CLREvent * FinalizerThread::hEventFinalizerToShutDown = NULL;
 
 HANDLE FinalizerThread::MHandles[kHandleCount];
 
-MethodDesc* g_pGCRunFinalizersMethodDesc = nullptr;
-
 bool FinalizerThread::IsCurrentThreadFinalizer()
 {
     LIMITED_METHOD_CONTRACT;

src/coreclr/vm/proftoeeinterfaceimpl.cpp

@@ -8066,9 +8066,12 @@ StackWalkAction ProfilerStackWalkCallback(CrawlFrame *pCf, PROFILER_STACK_WALK_D
     }
 
     //
-    // Skip runtime-invoked UCO entrypoint method (Environment.CallEntryPoint)
+    // Skip runtime-invoked UCO entrypoint methods
     //
-    if (pFunc != NULL && pFunc == g_pEnvironmentCallEntryPointMethodDesc)
+    if (pFunc != NULL && (
+        pFunc == g_pEnvironmentCallEntryPointMethodDesc ||
+        pFunc == g_pThreadStartCallbackMethodDesc ||
+        pFunc == g_pGCRunFinalizersMethodDesc))
     {
         return SWA_CONTINUE;
     }

src/coreclr/vm/vars.cpp

@@ -113,6 +113,8 @@ GPTR_IMPL(MethodTable,      g_pExceptionServicesInternalCallsClass);
 GPTR_IMPL(MethodTable,      g_pStackFrameIteratorClass);
 
 GPTR_IMPL(MethodDesc,       g_pEnvironmentCallEntryPointMethodDesc);
+GPTR_IMPL(MethodDesc,       g_pThreadStartCallbackMethodDesc);
+GPTR_IMPL(MethodDesc,       g_pGCRunFinalizersMethodDesc);
 
 GVAL_IMPL_INIT(PTR_WSTR, g_EntryAssemblyPath, NULL);