Move IsDebuggerPresent to minipal, convert to QCall

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

@@ -58,13 +58,12 @@ 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() != 0;
+
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "DebugDebugger_IsManagedDebuggerAttached")]
+        [SuppressGCTransition]
+        private static partial int IsManagedDebuggerAttached();
 
         // Constants representing the importance level of messages to be logged.
         //
@@ -85,9 +84,11 @@ public static extern bool IsAttached
         private static partial void LogInternal(int level, string? category, string? message);
 
         // Checks to see if an attached debugger has logging enabled
-        //
-        [MethodImpl(MethodImplOptions.InternalCall)]
-        public static extern bool IsLogging();
+        public static bool IsLogging() => IsLoggingInternal() != 0;
+
+        [LibraryImport(RuntimeHelpers.QCall, EntryPoint = "DebugDebugger_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/debug/ee/debugger.cpp

@@ -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;
     }
@@ -6469,7 +6469,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
@@ -6485,7 +6485,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"));
     }
@@ -7106,7 +7106,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();
@@ -7181,7 +7181,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();
@@ -8919,7 +8919,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();
     }
@@ -16796,4 +16796,3 @@ void Debugger::MulticastTraceNextStep(DELEGATEREF pbDel, INT32 count)
 #endif //DACCESS_COMPILE
 
 #endif //DEBUGGING_SUPPORTED
-

src/coreclr/debug/ee/debuggermessagebox.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/dlls/mscordac/mscordac_unixexports.src

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

src/coreclr/hosts/corerun/CMakeLists.txt

@@ -14,6 +14,7 @@ set(CLR_CMAKE_KEEP_NATIVE_SYMBOLS TRUE)
 add_executable_clr(corerun
   corerun.cpp
   dotenv.cpp
+  ${CLR_SRC_NATIVE_DIR}/minipal/debugger.c
   native.rc
 )
 

src/coreclr/hosts/corerun/corerun.hpp

@@ -49,6 +49,7 @@ namespace pal
 #ifdef TARGET_WINDOWS
 #define CDECL __cdecl
 #include <Windows.h>
+#include <minipal/debugger.h>
 
 #define DLL_EXPORT __declspec(dllexport)
 #define MAIN __cdecl wmain
@@ -138,7 +139,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/jit/error.h

@@ -9,6 +9,8 @@
 #include <corjit.h>   // for CORJIT_INTERNALERROR
 #include <safemath.h> // For FitsIn, used by SafeCvt methods.
 
+#include <minipal/debugger.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/minipal/CMakeLists.txt

@@ -5,4 +5,3 @@ if (CLR_CMAKE_HOST_UNIX)
 else (CLR_CMAKE_HOST_UNIX)
     add_subdirectory(Windows)
 endif (CLR_CMAKE_HOST_UNIX)
-

src/coreclr/minipal/Unix/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(SOURCES
     doublemapping.cpp
     dn-u16.cpp
+    ${CLR_SRC_NATIVE_DIR}/minipal/debugger.c
     ${CLR_SRC_NATIVE_DIR}/minipal/time.c
 )
 

src/coreclr/minipal/Windows/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(SOURCES
     doublemapping.cpp
     dn-u16.cpp
+    ${CLR_SRC_NATIVE_DIR}/minipal/debugger.c
     ${CLR_SRC_NATIVE_DIR}/minipal/utf8.c
     ${CLR_SRC_NATIVE_DIR}/minipal/time.c
 )

src/coreclr/nativeaot/Runtime/CMakeLists.txt

@@ -51,6 +51,7 @@ set(COMMON_RUNTIME_SOURCES
     ${GC_DIR}/softwarewritewatch.cpp
 
     ${CLR_SRC_NATIVE_DIR}/minipal/cpufeatures.c
+    ${CLR_SRC_NATIVE_DIR}/minipal/debugger.c
     ${CLR_SRC_NATIVE_DIR}/minipal/time.c
 )
 

src/coreclr/nativeaot/Runtime/MiscHelpers.cpp

@@ -36,6 +36,7 @@
 #include "yieldprocessornormalized.h"
 #include "RhConfig.h"
 #include <minipal/cpuid.h>
+#include <minipal/debugger.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_IsNativeDebuggerAttached()
+{
+    return minipal_is_native_debugger_present();
+}
+
 FCIMPL2(FC_BOOL_RET, RhCompareObjectContentsAndPadding, Object* pObj1, Object* pObj2)
 {
     ASSERT(pObj1->GetMethodTable() == pObj2->GetMethodTable());

src/coreclr/nativeaot/Runtime/PalRedhawkFunctions.h

@@ -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/rhassert.cpp

@@ -7,6 +7,8 @@
 #include "PalRedhawk.h"
 #include "rhassert.h"
 
+#include <minipal/debugger.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.

src/coreclr/nativeaot/Runtime/unix/PalRedhawkUnix.cpp

@@ -964,17 +964,6 @@ extern "C" void LeaveCriticalSection(CRITICAL_SECTION * lpCriticalSection)
     pthread_mutex_unlock(&lpCriticalSection->mutex);
 }
 
-extern "C" UInt32_BOOL IsDebuggerPresent()
-{
-#ifdef HOST_WASM
-    // For now always true since the browser will handle it in case of WASM.
-    return UInt32_TRUE;
-#else
-    // UNIXTODO: Implement this function
-    return UInt32_FALSE;
-#endif
-}
-
 extern "C" UInt32_BOOL SetEvent(HANDLE event)
 {
     EventUnixHandle* unixHandle = (EventUnixHandle*)event;

src/coreclr/nativeaot/System.Private.CoreLib/src/System.Private.CoreLib.csproj

@@ -270,9 +270,6 @@
     <Compile Include="$(CommonPath)Interop\Windows\Advapi32\Interop.ReportEvent_IntPtr.cs">
       <Link>Common\Interop\Windows\Advapi32\Interop.ReportEvent_IntPtr.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.IsDebuggerPresent.cs">
-      <Link>Interop\Windows\Kernel32\Interop.IsDebuggerPresent.cs</Link>
-    </Compile>
     <Compile Include="$(CommonPath)\Interop\Windows\Kernel32\Interop.RaiseFailFastException.cs">
       <Link>Interop\Windows\Kernel32\Interop.RaiseFailFastException.cs</Link>
     </Compile>

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

@@ -1,7 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Runtime;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace System.Diagnostics
 {
@@ -13,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 (Interop.Kernel32.IsDebuggerPresent())
+            if (Debugger.IsNativeDebuggerAttached())
                 Debug.DebugBreak();
 #else
             // UNIXTODO: Implement Debugger.Break
@@ -74,5 +76,10 @@ public static bool IsLogging()
             }
             return false;
         }
+
+        internal static bool IsNativeDebuggerAttached() => IsNativeDebuggerAttachedInternal() != 0;
+
+        [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 (Interop.Kernel32.IsDebuggerPresent())
+                if (Debugger.IsNativeDebuggerAttached())
                     return false;
 
                 if (s_once == 1 || Interlocked.Exchange(ref s_once, 1) == 1)

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/RuntimeImports.cs

@@ -24,7 +24,7 @@ namespace System.Runtime
     //            optional library, those methods can be moved to a different file/namespace/dll
     internal static partial class RuntimeImports
     {
-        private const string RuntimeLibrary = "*";
+        internal const string RuntimeLibrary = "*";
 
         [MethodImplAttribute(MethodImplOptions.InternalCall)]
         [RuntimeImport(RuntimeLibrary, "RhGetCrashInfoBuffer")]
@@ -425,7 +425,7 @@ internal static IntPtr RhHandleAllocDependent(object primary, object secondary)
         // Yield the cpu to another thread ready to process, if one is available.
         [LibraryImport(RuntimeLibrary, EntryPoint = "RhYield")]
         private static partial int _RhYield();
-        internal static bool RhYield() { return (_RhYield() != 0); }
+        internal static bool RhYield() => _RhYield() != 0;
 
         [LibraryImport(RuntimeLibrary, EntryPoint = "RhFlushProcessWriteBuffers")]
         internal static partial void RhFlushProcessWriteBuffers();

src/coreclr/pal/inc/pal.h

@@ -170,13 +170,6 @@ extern bool g_arm64_atomics_present;
 
 /******************* PAL-Specific Entrypoints *****************************/
 
-#define IsDebuggerPresent PAL_IsDebuggerPresent
-
-PALIMPORT
-BOOL
-PALAPI
-PAL_IsDebuggerPresent();
-
 #define DLL_PROCESS_ATTACH 1
 #define DLL_THREAD_ATTACH  2
 #define DLL_THREAD_DETACH  3

src/coreclr/pal/src/CMakeLists.txt

@@ -252,6 +252,9 @@ if(CLR_CMAKE_TARGET_LINUX)
   add_library(tracepointprovider OBJECT misc/tracepointprovider.cpp)
 endif(CLR_CMAKE_TARGET_LINUX)
 
+add_library(minipal_debugger STATIC ${CLR_SRC_NATIVE_DIR}/minipal/debugger.c)
+target_link_libraries(coreclrpal PRIVATE minipal_debugger)
+
 if(CLR_CMAKE_TARGET_OSX)
   find_library(COREFOUNDATION CoreFoundation)
   find_library(CORESERVICES CoreServices)

src/coreclr/pal/src/exception/machexception.cpp

@@ -31,6 +31,8 @@ SET_DEFAULT_DEBUG_CHANNEL(EXCEPT); // some headers have code with asserts, so do
 #include "pal/virtual.h"
 #include "pal/map.hpp"
 #include "pal/environ.h"
+
+#include <minipal/debugger.h>
 #include <minipal/utils.h>
 
 #include "machmessage.h"
@@ -180,7 +182,7 @@ GetExceptionMask()
         }
         else
         {
-            if (PAL_IsDebuggerPresent())
+            if (minipal_is_native_debugger_present())
             {
                 exMode = MachException_SuppressDebugging;
             }