Revert "Make UCO MethodDesc globals DAC-accessible"

am11 · am11 · commit 64b9459bda66 · 2026-04-15T05:06:15.000+03:00
This reverts commit e2d4338.
diff --git a/src/coreclr/debug/daccess/dacdbiimplstackwalk.cpp b/src/coreclr/debug/daccess/dacdbiimplstackwalk.cpp
@@ -307,12 +307,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::UnwindStackWalkFrame(StackWalkHan
                         continue;
                     }
 
-                    // Runtime-invoked UCO entrypoint methods (Environment.CallEntryPoint, Thread.StartCallback, GC.RunFinalizers)
-                    if (pMD == g_pEnvironmentCallEntryPointMethodDesc || pMD == g_pThreadStartCallbackMethodDesc || pMD == g_pGCRunFinalizersMethodDesc)
-                    {
-                        continue;
-                    }
-
                     fIsAtEndOfStack = FALSE;
                 }
                 else
@@ -427,11 +421,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetStackWalkCurrentFrameInfo(Stac
                         {
                             ftResult = kManagedExceptionHandlingCodeFrame;
                         }
-                        // Runtime-invoked UCO entrypoint methods
-                        else if (pMD == g_pEnvironmentCallEntryPointMethodDesc || pMD == g_pThreadStartCallbackMethodDesc || pMD == g_pGCRunFinalizersMethodDesc)
-                        {
-                            ftResult = kRuntimeEntryPointFrame;
-                        }
                         else
                         {
                             ftResult = kManagedStackFrame;
diff --git a/src/coreclr/debug/di/rsstackwalk.cpp b/src/coreclr/debug/di/rsstackwalk.cpp
@@ -602,11 +602,6 @@ HRESULT CordbStackWalk::GetFrameWorker(ICorDebugFrame ** ppFrame)
         STRESS_LOG1(LF_CORDB, LL_INFO1000, "CSW::GFW - managed exception handling code frame (%p)", this);
         return S_FALSE;
     }
-    else if (ft == IDacDbiInterface::kRuntimeEntryPointFrame)
-    {
-        STRESS_LOG1(LF_CORDB, LL_INFO1000, "CSW::GFW - runtime entry point frame (%p)", this);
-        return S_FALSE;
-    }
     else if (ft == IDacDbiInterface::kExplicitFrame)
     {
         STRESS_LOG1(LF_CORDB, LL_INFO1000, "CSW::GFW - explicit frame (%p)", this);
diff --git a/src/coreclr/debug/ee/controller.cpp b/src/coreclr/debug/ee/controller.cpp
@@ -6775,14 +6775,6 @@ bool DebuggerStepper::IsInterestingFrame(FrameInfo * pFrame)
         {
             return false;
         }
-
-        // Ignore runtime-invoked UCO entrypoint methods
-        if (pFrame->md == g_pEnvironmentCallEntryPointMethodDesc ||
-            pFrame->md == g_pThreadStartCallbackMethodDesc ||
-            pFrame->md == g_pGCRunFinalizersMethodDesc)
-        {
-            return false;
-        }
     }
 
     return true;
diff --git a/src/coreclr/debug/inc/dacdbiinterface.h b/src/coreclr/debug/inc/dacdbiinterface.h
@@ -1231,7 +1231,6 @@ IDacDbiInterface : public IUnknown
         kNativeStackFrame,
         kNativeRuntimeUnwindableStackFrame,
         kManagedExceptionHandlingCodeFrame,
-        kRuntimeEntryPointFrame,
         kAtEndOfStack,
     } FrameType;
 
diff --git a/src/coreclr/inc/dacvars.h b/src/coreclr/inc/dacvars.h
@@ -125,10 +125,6 @@ DEFINE_DACVAR(UNKNOWN_POINTER_TYPE, dac__g_pEHClass, ::g_pEHClass)
 DEFINE_DACVAR(UNKNOWN_POINTER_TYPE, dac__g_pExceptionServicesInternalCallsClass, ::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)
 
 DEFINE_DACVAR(INT32, ArrayBase__s_arrayBoundsZero, ArrayBase::s_arrayBoundsZero)
diff --git a/src/coreclr/vm/assembly.cpp b/src/coreclr/vm/assembly.cpp
@@ -1165,6 +1165,8 @@ struct Param
     bool captureException;
 } param;
 
+MethodDesc* g_pEnvironmentCallEntryPointMethodDesc = nullptr;
+
 #if defined(TARGET_BROWSER)
 extern "C" void SystemJS_ResolveMainPromise(int exitCode);
 #endif // TARGET_BROWSER
diff --git a/src/coreclr/vm/comsynchronizable.cpp b/src/coreclr/vm/comsynchronizable.cpp
@@ -31,6 +31,8 @@
 #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.
diff --git a/src/coreclr/vm/debugdebugger.cpp b/src/coreclr/vm/debugdebugger.cpp
@@ -32,6 +32,8 @@
 
 #ifndef DACCESS_COMPILE
 
+extern MethodDesc* g_pEnvironmentCallEntryPointMethodDesc;
+
 //
 // Notes:
 //    If a managed debugger is attached, this should send the managed UserBreak event.
@@ -193,9 +195,7 @@ static StackWalkAction GetStackFramesCallback(CrawlFrame* pCf, VOID* data)
     //                       because we asked the stackwalker for it!
     MethodDesc* pFunc = pCf->GetFunction();
 
-    if (pFunc != nullptr && (pFunc == g_pEnvironmentCallEntryPointMethodDesc ||
-                              pFunc == g_pThreadStartCallbackMethodDesc ||
-                              pFunc == g_pGCRunFinalizersMethodDesc))
+    if (pFunc != nullptr && pFunc == g_pEnvironmentCallEntryPointMethodDesc)
     {
         return SWA_CONTINUE;
     }
diff --git a/src/coreclr/vm/eepolicy.cpp b/src/coreclr/vm/eepolicy.cpp
@@ -23,6 +23,8 @@
 #include "eventtrace.h"
 #undef ExitProcess
 
+extern MethodDesc* g_pEnvironmentCallEntryPointMethodDesc;
+
 void SafeExitProcess(UINT exitCode, ShutdownCompleteAction sca = SCA_ExitProcessWhenShutdownComplete)
 {
     STRESS_LOG2(LF_SYNC, LL_INFO10, "SafeExitProcess: exitCode = %d sca = %d\n", exitCode, sca);
@@ -178,11 +180,9 @@ class CallStackLogger
 
         MethodDesc* pMD = pCF->GetFunction();
 
-        // Skip runtime-invoked UCO entrypoint methods so they don't appear in
+        // Skip Environment.CallEntryPoint so it doesn't appear in vanilla
         // unhandled exception experiences.
-        if (pMD != nullptr && (pMD == g_pEnvironmentCallEntryPointMethodDesc ||
-                               pMD == g_pThreadStartCallbackMethodDesc ||
-                               pMD == g_pGCRunFinalizersMethodDesc))
+        if (pMD != nullptr && pMD == g_pEnvironmentCallEntryPointMethodDesc)
         {
             return SWA_CONTINUE;
         }
diff --git a/src/coreclr/vm/exceptionhandling.cpp b/src/coreclr/vm/exceptionhandling.cpp
@@ -18,6 +18,10 @@
 #include "exinfo.h"
 #include "configuration.h"
 
+extern MethodDesc* g_pEnvironmentCallEntryPointMethodDesc;
+extern MethodDesc* g_pThreadStartCallbackMethodDesc;
+extern MethodDesc* g_pGCRunFinalizersMethodDesc;
+
 #if defined(TARGET_X86)
 #define USE_CURRENT_CONTEXT_IN_FILTER
 #endif // TARGET_X86
diff --git a/src/coreclr/vm/finalizerthread.cpp b/src/coreclr/vm/finalizerthread.cpp
@@ -34,6 +34,8 @@ CLREvent * FinalizerThread::hEventFinalizerToShutDown = NULL;
 
 HANDLE FinalizerThread::MHandles[kHandleCount];
 
+MethodDesc* g_pGCRunFinalizersMethodDesc = nullptr;
+
 bool FinalizerThread::IsCurrentThreadFinalizer()
 {
     LIMITED_METHOD_CONTRACT;
diff --git a/src/coreclr/vm/proftoeeinterfaceimpl.cpp b/src/coreclr/vm/proftoeeinterfaceimpl.cpp
@@ -8065,17 +8065,6 @@ StackWalkAction ProfilerStackWalkCallback(CrawlFrame *pCf, PROFILER_STACK_WALK_D
         return SWA_CONTINUE;
     }
 
-    //
-    // Skip runtime-invoked UCO entrypoint methods
-    //
-    if (pFunc != NULL && (
-        pFunc == g_pEnvironmentCallEntryPointMethodDesc ||
-        pFunc == g_pThreadStartCallbackMethodDesc ||
-        pFunc == g_pGCRunFinalizersMethodDesc))
-    {
-        return SWA_CONTINUE;
-    }
-
     //
     // For Unmanaged-to-managed transitions we get a NativeMarker back, which we want
     // to return to the profiler as the context seed if it wants to walk the unmanaged
diff --git a/src/coreclr/vm/vars.cpp b/src/coreclr/vm/vars.cpp
@@ -112,10 +112,6 @@ GPTR_IMPL(MethodTable,      g_pEHClass);
 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);
 
 #ifndef DACCESS_COMPILE
diff --git a/src/coreclr/vm/vars.hpp b/src/coreclr/vm/vars.hpp
@@ -381,10 +381,6 @@ GPTR_DECL(MethodTable,      g_pEHClass);
 GPTR_DECL(MethodTable,      g_pExceptionServicesInternalCallsClass);
 GPTR_DECL(MethodTable,      g_pStackFrameIteratorClass);
 
-GPTR_DECL(MethodDesc,       g_pEnvironmentCallEntryPointMethodDesc);
-GPTR_DECL(MethodDesc,       g_pThreadStartCallbackMethodDesc);
-GPTR_DECL(MethodDesc,       g_pGCRunFinalizersMethodDesc);
-
 // Full path to the managed entry assembly - stored for ease of identifying the entry asssembly for diagnostics
 GVAL_DECL(PTR_WSTR, g_EntryAssemblyPath);
 

Original file line number	Diff line number	Diff line change
`@@ -307,12 +307,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::UnwindStackWalkFrame(StackWalkHan`
`307`	`307`	`continue;`
`308`	`308`	`}`
`309`	`309`
`310`		`- // Runtime-invoked UCO entrypoint methods (Environment.CallEntryPoint, Thread.StartCallback, GC.RunFinalizers)`
`311`		`- if (pMD == g_pEnvironmentCallEntryPointMethodDesc \|\| pMD == g_pThreadStartCallbackMethodDesc \|\| pMD == g_pGCRunFinalizersMethodDesc)`
`312`		`- {`
`313`		`- continue;`
`314`		`- }`
`315`		`-`
`316`	`310`	`fIsAtEndOfStack = FALSE;`
`317`	`311`	`}`
`318`	`312`	`else`
`@@ -427,11 +421,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetStackWalkCurrentFrameInfo(Stac`
`427`	`421`	`{`
`428`	`422`	`ftResult = kManagedExceptionHandlingCodeFrame;`
`429`	`423`	`}`
`430`		`- // Runtime-invoked UCO entrypoint methods`
`431`		`- else if (pMD == g_pEnvironmentCallEntryPointMethodDesc \|\| pMD == g_pThreadStartCallbackMethodDesc \|\| pMD == g_pGCRunFinalizersMethodDesc)`
`432`		`- {`
`433`		`- ftResult = kRuntimeEntryPointFrame;`
`434`		`- }`
`435`	`424`	`else`
`436`	`425`	`{`
`437`	`426`	`ftResult = kManagedStackFrame;`
Original file line number	Diff line number	Diff line change
`@@ -602,11 +602,6 @@ HRESULT CordbStackWalk::GetFrameWorker(ICorDebugFrame ** ppFrame)`
`602`	`602`	`STRESS_LOG1(LF_CORDB, LL_INFO1000, "CSW::GFW - managed exception handling code frame (%p)", this);`
`603`	`603`	`return S_FALSE;`
`604`	`604`	`}`
`605`		`- else if (ft == IDacDbiInterface::kRuntimeEntryPointFrame)`
`606`		`- {`
`607`		`- STRESS_LOG1(LF_CORDB, LL_INFO1000, "CSW::GFW - runtime entry point frame (%p)", this);`
`608`		`- return S_FALSE;`
`609`		`- }`
`610`	`605`	`else if (ft == IDacDbiInterface::kExplicitFrame)`
`611`	`606`	`{`
`612`	`607`	`STRESS_LOG1(LF_CORDB, LL_INFO1000, "CSW::GFW - explicit frame (%p)", this);`
Original file line number	Diff line number	Diff line change
`@@ -6775,14 +6775,6 @@ bool DebuggerStepper::IsInterestingFrame(FrameInfo * pFrame)`
`6775`	`6775`	`{`
`6776`	`6776`	`return false;`
`6777`	`6777`	`}`
`6778`		`-`
`6779`		`- // Ignore runtime-invoked UCO entrypoint methods`
`6780`		`- if (pFrame->md == g_pEnvironmentCallEntryPointMethodDesc \|\|`
`6781`		`- pFrame->md == g_pThreadStartCallbackMethodDesc \|\|`
`6782`		`- pFrame->md == g_pGCRunFinalizersMethodDesc)`
`6783`		`- {`
`6784`		`- return false;`
`6785`		`- }`
`6786`	`6778`	`}`
`6787`	`6779`
`6788`	`6780`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`#include "eventtrace.h"`
`24`	`24`	`#undef ExitProcess`
`25`	`25`
	`26`	`+extern MethodDesc* g_pEnvironmentCallEntryPointMethodDesc;`
	`27`	`+`
`26`	`28`	`void SafeExitProcess(UINT exitCode, ShutdownCompleteAction sca = SCA_ExitProcessWhenShutdownComplete)`
`27`	`29`	`{`
`28`	`30`	`STRESS_LOG2(LF_SYNC, LL_INFO10, "SafeExitProcess: exitCode = %d sca = %d\n", exitCode, sca);`
`@@ -178,11 +180,9 @@ class CallStackLogger`
`178`	`180`
`179`	`181`	`MethodDesc* pMD = pCF->GetFunction();`
`180`	`182`
`181`		`- // Skip runtime-invoked UCO entrypoint methods so they don't appear in`
	`183`	`+ // Skip Environment.CallEntryPoint so it doesn't appear in vanilla`
`182`	`184`	`// unhandled exception experiences.`
`183`		`- if (pMD != nullptr && (pMD == g_pEnvironmentCallEntryPointMethodDesc \|\|`
`184`		`- pMD == g_pThreadStartCallbackMethodDesc \|\|`
`185`		`- pMD == g_pGCRunFinalizersMethodDesc))`
	`185`	`+ if (pMD != nullptr && pMD == g_pEnvironmentCallEntryPointMethodDesc)`
`186`	`186`	`{`
`187`	`187`	`return SWA_CONTINUE;`
`188`	`188`	`}`