Cleanups

Author: am11

src/coreclr/System.Private.CoreLib/src/System/Diagnostics/Debugger.cs

@@ -65,12 +65,6 @@ static void NotifyOfCrossThreadDependencySlow()
         [SuppressGCTransition]
         private static partial int IsManagedDebuggerAttached();
 
-        internal static bool IsAnyDebuggerAttached() => IsAnyDebuggerAttachedInternal() != 0;
-
-        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "DebugDebugger_IsAnyDebuggerAttached")]
-        [SuppressGCTransition]
-        private static partial int IsAnyDebuggerAttachedInternal();
-
         // Constants representing the importance level of messages to be logged.
         //
         // An attached debugger can enable or disable which messages will

src/coreclr/nativeaot/Runtime/MiscHelpers.cpp

@@ -395,9 +395,8 @@ EXTERN_C int32_t QCALLTYPE RhpGetCurrentThreadStackTrace(void* pOutputBuffer, ui
     return RhpCalculateStackTraceWorker(pOutputBuffer, outputBufferLength, pAddressInCurrentFrame);
 }
 
-EXTERN_C UInt32_BOOL QCALLTYPE DebugDebugger_IsAnyDebuggerAttached()
+EXTERN_C UInt32_BOOL QCALLTYPE DebugDebugger_IsNativeDebuggerAttached()
 {
-    // Explicitly not checking for a managed debugger; only checking for a native debugger.
     return minipal_is_native_debugger_present();
 }
 

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Diagnostics/Debugger.cs

@@ -15,7 +15,7 @@ public static void Break()
         {
 #if TARGET_WINDOWS
             // IsAttached is always true when IsDebuggerPresent is true, so no need to check for it
-            if (Debugger.IsAnyDebuggerAttached())
+            if (Debugger.IsNativeDebuggerAttached())
                 Debug.DebugBreak();
 #else
             // UNIXTODO: Implement Debugger.Break
@@ -77,10 +77,9 @@ public static bool IsLogging()
             return false;
         }
 
-        internal static bool IsAnyDebuggerAttached() => IsAnyDebuggerAttachedInternal() != 0;
+        internal static bool IsNativeDebuggerAttached() => IsNativeDebuggerAttachedInternal() != 0;
 
-        [LibraryImport(RuntimeImports.RuntimeLibrary, EntryPoint = "DebugDebugger_IsAnyDebuggerAttached")]
-        [SuppressGCTransition]
-        private static partial int IsAnyDebuggerAttachedInternal();
+        [LibraryImport(RuntimeImports.RuntimeLibrary, EntryPoint = "DebugDebugger_IsNativeDebuggerAttached")]
+        private static partial int IsNativeDebuggerAttachedInternal();
     }
 }

src/coreclr/nativeaot/System.Private.CoreLib/src/System/EventReporter.cs

@@ -177,7 +177,7 @@ public static bool ShouldLogInEventLog
         {
             get
             {
-                if (Debugger.IsAnyDebuggerAttached())
+                if (Debugger.IsNativeDebuggerAttached())
                     return false;
 
                 if (s_once == 1 || Interlocked.Exchange(ref s_once, 1) == 1)

src/coreclr/vm/debugdebugger.cpp

@@ -867,17 +867,6 @@ extern "C" BOOL QCALLTYPE DebugDebugger_IsLoggingHelper()
     return FALSE;
 }
 
-extern "C" BOOL QCALLTYPE DebugDebugger_IsAnyDebuggerAttached()
-{
-    QCALL_CONTRACT_NO_GC_TRANSITION;
-
-#ifdef DEBUGGING_SUPPORTED
-    return CORDebuggerAttached() || minipal_is_native_debugger_present();
-#endif // DEBUGGING_SUPPORTED
-
-    return FALSE;
-}
-
 extern "C" BOOL QCALLTYPE DebugDebugger_IsManagedDebuggerAttached()
 {
     QCALL_CONTRACT_NO_GC_TRANSITION;

src/coreclr/vm/debugdebugger.h

@@ -18,7 +18,6 @@ extern "C" BOOL QCALLTYPE DebugDebugger_Launch();
 extern "C" void QCALLTYPE DebugDebugger_Log(INT32 Level, PCWSTR pwzModule, PCWSTR pwzMessage);
 extern "C" void QCALLTYPE DebugDebugger_CustomNotification(QCall::ObjectHandleOnStack data);
 extern "C" BOOL QCALLTYPE DebugDebugger_IsLoggingHelper();
-extern "C" BOOL QCALLTYPE DebugDebugger_IsAnyDebuggerAttached();
 extern "C" BOOL QCALLTYPE DebugDebugger_IsManagedDebuggerAttached();
 
 class StackFrameHelper : public Object

src/coreclr/vm/qcallentrypoints.cpp

@@ -90,7 +90,6 @@ static const Entry s_QCall[] =
     DllImportEntry(DebugDebugger_CustomNotification)
     DllImportEntry(DebugDebugger_IsLoggingHelper)
     DllImportEntry(DebugDebugger_IsManagedDebuggerAttached)
-    DllImportEntry(DebugDebugger_IsAnyDebuggerAttached)
     DllImportEntry(Delegate_BindToMethodName)
     DllImportEntry(Delegate_BindToMethodInfo)
     DllImportEntry(Delegate_InitializeVirtualCallStub)