Move IsDebuggerPresent to minipal, convert to QCall

Author: am11

s

@@ -58,13 +58,18 @@ static void NotifyOfCrossThreadDependencySlow()
         [return: MarshalAs(UnmanagedType.Bool)]
         private static partial bool LaunchInternal();
 
-        // Returns whether or not a debugger is attached to the process.
-        //
-        public static extern bool IsAttached
-        {
-            [MethodImpl(MethodImplOptions.InternalCall)]
-            get;
-        }
+        // Returns whether or not a managed debugger is attached to the process.
+        public static bool IsAttached => IsManagedDebuggerAttached();
+
+        // Checks to see if an attached debugger has logging enabled
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "DebugDebugger_IsManagedDebuggerAttached")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool IsManagedDebuggerAttached();
+
+        // Checks to see if an attached debugger has logging enabled
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "DebugDebugger_IsAnyDebuggerAttached")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static partial bool IsAnyDebuggerAttached();
 
         // Constants representing the importance level of messages to be logged.
         //
@@ -84,10 +89,12 @@ public static extern bool IsAttached
         [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "DebugDebugger_Log", StringMarshalling = StringMarshalling.Utf16)]
         private static partial void LogInternal(int level, string? category, string? message);
 
+        public static bool IsLogging() => IsLoggingHelper();
+
         // Checks to see if an attached debugger has logging enabled
-        //
-        [MethodImpl(MethodImplOptions.InternalCall)]
-        public static extern bool IsLogging();
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "DebugDebugger_IsLoggingHelper")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool IsLoggingHelper();
 
         // 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/System.Private.CoreLib/src/System/Diagnostics/Debugger.cs

@@ -1651,7 +1651,7 @@ void Debugger::SendRawEvent(const DebuggerIPCEvent * pManagedEvent)
 
     // If no debugger attached, then don't bother raising a 1st-chance exception because nobody will sniff it.
     // @dbgtodo iDNA: in iDNA case, the recorder may sniff it.
-    if (!IsDebuggerPresent())
+    if (!minipal_is_native_debugger_present())
     {
         return;
     }
@@ -6460,7 +6460,7 @@ HRESULT Debugger::LaunchDebuggerForUser(Thread * pThread, EXCEPTION_POINTERS * p
             //
             SendUserBreakpointAndSynchronize(g_pEEInterface->GetThread());
         }
-        else if (!CORDebuggerAttached() && IsDebuggerPresent())
+        else if (!CORDebuggerAttached() && minipal_is_native_debugger_present())
         {
             //
             // If the registered debugger is not a managed debugger, send a native breakpoint
@@ -6476,7 +6476,7 @@ HRESULT Debugger::LaunchDebuggerForUser(Thread * pThread, EXCEPTION_POINTERS * p
         DebugBreak();
     }
 
-    if (!IsDebuggerPresent())
+    if (!minipal_is_native_debugger_present())
     {
         LOG((LF_CORDB, LL_ERROR, "D::LDFU: Failed to launch the debugger.\n"));
     }
@@ -7097,7 +7097,7 @@ void Debugger::JitAttach(Thread * pThread, EXCEPTION_POINTERS * pExceptionInfo,
     CONTRACTL_END;
 
     // Don't do anything if there is a native debugger already attached or the debugging support has been disabled.
-    if (IsDebuggerPresent() || m_pRCThread == NULL)
+    if (minipal_is_native_debugger_present() || m_pRCThread == NULL)
         return;
 
     GCX_PREEMP_EEINTERFACE_TOGGLE_IFTHREAD();
@@ -7172,7 +7172,7 @@ void Debugger::EnsureDebuggerAttached(Thread * pThread, EXCEPTION_POINTERS * pEx
     {
         // if the debugger is already attached then we can't launch one
         // and whatever attach state we are in is just what we get
-        if(IsDebuggerPresent())
+        if(minipal_is_native_debugger_present())
         {
             // unblock other threads waiting on our attach and clean up
             PostJitAttach();
@@ -8910,7 +8910,7 @@ void Debugger::SendUserBreakpoint(Thread * thread)
         // On jit-attach, we just send the UserBreak event. Don't do an extra step-out.
         SendUserBreakpointAndSynchronize(thread);
     }
-    else if (IsDebuggerPresent())
+    else if (minipal_is_native_debugger_present())
     {
         DebugBreak();
     }
@@ -16784,4 +16784,3 @@ void Debugger::MulticastTraceNextStep(DELEGATEREF pbDel, INT32 count)
 #endif //DACCESS_COMPILE
 
 #endif //DEBUGGING_SUPPORTED
-

src/coreclr/debug/ee/debugger.cpp

@@ -23,7 +23,7 @@ static void DbgPrintf(const LPCSTR szFormat, ...)
 
     va_end(args);
 
-    if (IsDebuggerPresent())
+    if (minipal_is_native_debugger_present())
     {
         OutputDebugStringUtf8(szBuffer);
     }

src/coreclr/debug/ee/debuggermessagebox.cpp

@@ -36,7 +36,6 @@ nativeStringResourceTable_mscorrc
 #PAL_GetTransportPipeName
 #PAL_InitializeDLL
 #PAL_TerminateEx
-#PAL_IsDebuggerPresent
 #PAL_OpenProcessMemory
 #PAL_CloseProcessMemory
 #PAL_ReadProcessMemory

src/coreclr/dlls/mscordac/mscordac_unixexports.src

@@ -138,7 +138,7 @@ namespace pal
 
     inline debugger_state_t is_debugger_attached()
     {
-        return (::IsDebuggerPresent() == TRUE) ? debugger_state_t::attached : debugger_state_t::not_attached;
+        return (minipal_is_native_debugger_present() == TRUE) ? debugger_state_t::attached : debugger_state_t::not_attached;
     }
 
     inline bool does_file_exist(const string_t& file_path)

src/coreclr/hosts/corerun/corerun.hpp

@@ -9,6 +9,8 @@
 #include <corjit.h>   // for CORJIT_INTERNALERROR
 #include <safemath.h> // For FitsIn, used by SafeCvt methods.
 
+#include <minipal/is_native_debugger_present.h>
+
 #define FATAL_JIT_EXCEPTION 0x02345678
 class Compiler;
 
@@ -247,7 +249,7 @@ extern void notYetImplemented(const char* msg, const char* file, unsigned line);
 #define BreakIfDebuggerPresent()                                                                                       \
     do                                                                                                                 \
     {                                                                                                                  \
-        if (IsDebuggerPresent())                                                                                       \
+        if (minipal_is_native_debugger_present())                                                                                       \
             DebugBreak();                                                                                              \
     } while (0)
 #endif

src/coreclr/jit/error.h

@@ -36,6 +36,7 @@
 #include "yieldprocessornormalized.h"
 #include "RhConfig.h"
 #include <minipal/cpuid.h>
+#include <minipal/is_native_debugger_present.h>
 
 FCIMPL0(void, RhDebugBreak)
 {
@@ -394,6 +395,11 @@ EXTERN_C int32_t QCALLTYPE RhpGetCurrentThreadStackTrace(void* pOutputBuffer, ui
     return RhpCalculateStackTraceWorker(pOutputBuffer, outputBufferLength, pAddressInCurrentFrame);
 }
 
+EXTERN_C UInt32_BOOL QCALLTYPE DebugDebugger_IsAnyDebuggerAttached()
+{
+    return minipal_is_native_debugger_present();
+}
+
 FCIMPL2(FC_BOOL_RET, RhCompareObjectContentsAndPadding, Object* pObj1, Object* pObj2)
 {
     ASSERT(pObj1->GetMethodTable() == pObj2->GetMethodTable());

src/coreclr/nativeaot/Runtime/MiscHelpers.cpp

@@ -77,12 +77,6 @@ inline UInt32_BOOL PalInitializeCriticalSectionEx(CRITICAL_SECTION * arg1, uint3
     return InitializeCriticalSectionEx(arg1, arg2, arg3);
 }
 
-extern "C" UInt32_BOOL __stdcall IsDebuggerPresent();
-inline UInt32_BOOL PalIsDebuggerPresent()
-{
-    return IsDebuggerPresent();
-}
-
 extern "C" void __stdcall LeaveCriticalSection(CRITICAL_SECTION *);
 inline void PalLeaveCriticalSection(CRITICAL_SECTION * arg1)
 {

src/coreclr/nativeaot/Runtime/PalRedhawkFunctions.h

@@ -7,6 +7,8 @@
 #include "PalRedhawk.h"
 #include "rhassert.h"
 
+#include <minipal/is_native_debugger_present.h>
+
 #ifdef _DEBUG
 
 void Assert(const char * expr, const char * file, uint32_t line_num, const char * message)
@@ -28,7 +30,7 @@ void Assert(const char * expr, const char * file, uint32_t line_num, const char
     fflush(stdout);
 
     // If there's no debugger attached, we just FailFast
-    if (!PalIsDebuggerPresent())
+    if (!minipal_is_native_debugger_present())
         PalRaiseFailFastException(NULL, NULL, FAIL_FAST_GENERATE_EXCEPTION_ADDRESS);
 
     // If there is a debugger attached, we break and then allow continuation.