Address CR feedback

Author: am11

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

@@ -59,15 +59,17 @@ static void NotifyOfCrossThreadDependencySlow()
         private static partial bool LaunchInternal();
 
         // Returns whether or not a managed debugger is attached to the process.
-        public static bool IsAttached => IsManagedDebuggerAttached();
+        public static bool IsAttached => IsManagedDebuggerAttached() != 0;
 
         [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "DebugDebugger_IsManagedDebuggerAttached")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static partial bool IsManagedDebuggerAttached();
+        [SuppressGCTransition]
+        private static partial int IsManagedDebuggerAttached();
+
+        internal static bool IsAnyDebuggerAttached() => IsAnyDebuggerAttachedInternal() != 0;
 
         [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "DebugDebugger_IsAnyDebuggerAttached")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static partial bool IsAnyDebuggerAttached();
+        [SuppressGCTransition]
+        private static partial int IsAnyDebuggerAttachedInternal();
 
         // Constants representing the importance level of messages to be logged.
         //
@@ -88,11 +90,11 @@ static void NotifyOfCrossThreadDependencySlow()
         private static partial void LogInternal(int level, string? category, string? message);
 
         // Checks to see if an attached debugger has logging enabled
-        public static bool IsLogging() => IsLoggingHelper();
+        public static bool IsLogging() => IsLoggingInternal() != 0;
 
         [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "DebugDebugger_IsLoggingHelper")]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        private static partial bool IsLoggingHelper();
+        [SuppressGCTransition]
+        private static partial int IsLoggingInternal();
 
         // Posts a custom notification for the attached debugger.  If there is no
         // debugger attached, has no effect.  The debugger may or may not

src/coreclr/nativeaot/Runtime/MiscHelpers.cpp

@@ -397,6 +397,7 @@ EXTERN_C int32_t QCALLTYPE RhpGetCurrentThreadStackTrace(void* pOutputBuffer, ui
 
 EXTERN_C UInt32_BOOL QCALLTYPE DebugDebugger_IsAnyDebuggerAttached()
 {
+    // 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

@@ -77,8 +77,10 @@ public static bool IsLogging()
             return false;
         }
 
+        internal static bool IsAnyDebuggerAttached() => IsAnyDebuggerAttachedInternal() != 0;
+
         [LibraryImport(RuntimeImports.RuntimeLibrary, EntryPoint = "DebugDebugger_IsAnyDebuggerAttached")]
-        private static partial int DebugDebugger_IsAnyDebuggerAttached();
-        internal static bool IsAnyDebuggerAttached() => DebugDebugger_IsAnyDebuggerAttached() != 0;
+        [SuppressGCTransition]
+        private static partial int IsAnyDebuggerAttachedInternal();
     }
 }

src/coreclr/vm/debugdebugger.cpp

@@ -855,56 +855,38 @@ extern "C" void QCALLTYPE DebugDebugger_CustomNotification(QCall::ObjectHandleOn
 
 extern "C" BOOL QCALLTYPE DebugDebugger_IsLoggingHelper()
 {
-    QCALL_CONTRACT;
-
-    BOOL result = FALSE;
-
-    BEGIN_QCALL;
+    QCALL_CONTRACT_NO_GC_TRANSITION;
 
 #ifdef DEBUGGING_SUPPORTED
     if (CORDebuggerAttached())
     {
-        result = g_pDebugInterface->IsLoggingEnabled();
+        return g_pDebugInterface->IsLoggingEnabled();
     }
 #endif // DEBUGGING_SUPPORTED
 
-    END_QCALL;
-
-    return result;
+    return FALSE;
 }
 
 extern "C" BOOL QCALLTYPE DebugDebugger_IsAnyDebuggerAttached()
 {
-    QCALL_CONTRACT;
-
-    BOOL result = FALSE;
-
-    BEGIN_QCALL;
+    QCALL_CONTRACT_NO_GC_TRANSITION;
 
 #ifdef DEBUGGING_SUPPORTED
-    result = CORDebuggerAttached() || minipal_is_native_debugger_present();
+    return CORDebuggerAttached() || minipal_is_native_debugger_present();
 #endif // DEBUGGING_SUPPORTED
 
-    END_QCALL;
-
-    return result;
+    return FALSE;
 }
 
 extern "C" BOOL QCALLTYPE DebugDebugger_IsManagedDebuggerAttached()
 {
-    QCALL_CONTRACT;
-
-    BOOL result = FALSE;
-
-    BEGIN_QCALL;
+    QCALL_CONTRACT_NO_GC_TRANSITION;
 
 #ifdef DEBUGGING_SUPPORTED
-    result = CORDebuggerAttached();
+    return CORDebuggerAttached();
 #endif
 
-    END_QCALL;
-
-    return result;
+    return FALSE;
 }
 #endif // !DACCESS_COMPILE