dotnet · jkotas · Oct 1, 2025 · Aug 30, 2025 · Aug 31, 2025 · Sep 1, 2025
diff --git a/src/coreclr/debug/di/rsmain.cpp b/src/coreclr/debug/di/rsmain.cpp
@@ -1646,7 +1646,7 @@ HRESULT Cordb::CreateProcessCommon(ICorDebugRemoteTarget * pRemoteTarget,
                 break;
 
             default:
-                __assume(0);
+                UNREACHABLE();
         }
 
     #endif // FEATURE_INTEROP_DEBUGGING

diff --git a/src/coreclr/debug/ee/debugger.cpp b/src/coreclr/debug/ee/debugger.cpp
@@ -8643,12 +8643,16 @@ int Debugger::NotifyUserOfFault(bool userBreakpoint, DebuggerLaunchSetting dls)
         if (userBreakpoint)
         {
             msg = "Application has encountered a user-defined breakpoint.\n\nProcess ID=0x%x (%d), Thread ID=0x%x (%d).\n\nClick ABORT to terminate the application.\nClick RETRY to debug the application.\nClick IGNORE to ignore the breakpoint.";
+#ifdef HOST_WINDOWS
             flags |= MB_ABORTRETRYIGNORE | MB_ICONEXCLAMATION;
+#endif
         }
         else
         {
             msg = "Application has generated an exception that could not be handled.\n\nProcess ID=0x%x (%d), Thread ID=0x%x (%d).\n\nClick OK to terminate the application.\nClick CANCEL to debug the application.";
+#ifdef HOST_WINDOWS
             flags |= MB_OKCANCEL | MB_ICONEXCLAMATION;
+#endif
         }
 
         // Format message string using optional parameters

diff --git a/src/coreclr/debug/ee/debuggermessagebox.cpp b/src/coreclr/debug/ee/debuggermessagebox.cpp
@@ -34,10 +34,12 @@ static void DbgPrintf(const LPCSTR szFormat, ...)
     }
 }
 
+#ifndef HOST_UNIX
 typedef int (*MessageBoxWFnPtr)(HWND hWnd,
                                 LPCWSTR lpText,
                                 LPCWSTR lpCaption,
                                 UINT uType);
+#endif // !HOST_UNIX
 
 static int MessageBoxImpl(
                   LPCWSTR title,        // Dialog box title
@@ -157,10 +159,12 @@ int NotifyUserOfFaultMessageBox(
 
     int result = IDCANCEL;
 
+#ifdef HOST_WINDOWS
     // Add the MB_TASKMODAL style to indicate that the dialog should be displayed on top of the windows
     // owned by the current thread and should prevent interaction with them until dismissed.
     // Include in the MB_DEFAULT_DESKTOP_ONLY style.
     uType |= (MB_TASKMODAL | MB_DEFAULT_DESKTOP_ONLY);
+#endif
 
     EX_TRY
     {

diff --git a/src/coreclr/gc/env/gcenv.base.h b/src/coreclr/gc/env/gcenv.base.h
@@ -21,23 +21,8 @@
 
 #ifndef _MSC_VER
 #define __stdcall
-#ifdef __GNUC__
-#define __forceinline __attribute__((always_inline)) inline
-#else // __GNUC__
-#define __forceinline inline
-#endif // __GNUC__
-// [LOCALGC TODO] is there a better place for this?
-#define NOINLINE __attribute__((noinline))
-#else // !_MSC_VER
-#define NOINLINE __declspec(noinline)
 #endif // _MSC_VER
 
-#ifdef _MSC_VER
-#define __UNREACHABLE() __assume(0)
-#else
-#define __UNREACHABLE() __builtin_unreachable()
-#endif
-
 #ifndef SIZE_T_MAX
 #define SIZE_T_MAX ((size_t)-1)
 #endif
@@ -88,7 +73,6 @@ inline HRESULT HRESULT_FROM_WIN32(unsigned long x)
 #define FALSE false
 
 #define CALLBACK __stdcall
-#define FORCEINLINE __forceinline
 
 #define INFINITE 0xFFFFFFFF
 
@@ -103,12 +87,6 @@ inline HRESULT HRESULT_FROM_WIN32(unsigned long x)
   snprintf(string, sizeInBytes, format, ## __VA_ARGS__)
 #endif
 
-#ifdef UNICODE
-#define _tfopen _wfopen
-#else
-#define _tfopen fopen
-#endif
-
 #define WINAPI __stdcall
 
 typedef DWORD (WINAPI *PTHREAD_START_ROUTINE)(void* lpThreadParameter);
@@ -448,19 +426,12 @@ typedef DPTR(uint8_t)   PTR_uint8_t;
 #define DATA_ALIGNMENT sizeof(uintptr_t)
 #define RAW_KEYWORD(x) x
 
-#ifdef _MSC_VER
-#define DECLSPEC_ALIGN(x)   __declspec(align(x))
-#else
-#define DECLSPEC_ALIGN(x)   __attribute__((aligned(x)))
-#endif
-
 #ifndef _ASSERTE
 #define _ASSERTE(_expr) ASSERT(_expr)
 #endif
 #define CONSISTENCY_CHECK(_expr) ASSERT(_expr)
 #define COMPILER_ASSUME(cond) ASSERT(cond)
 #define EEPOLICY_HANDLE_FATAL_ERROR(error) ASSERT(!"EEPOLICY_HANDLE_FATAL_ERROR")
-#define UI64(_literal) _literal##ULL
 
 class ObjHeader;
 class MethodTable;

diff --git a/src/coreclr/gc/env/gcenv.interlocked.inl b/src/coreclr/gc/env/gcenv.interlocked.inl
@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-// __forceinline implementation of the Interlocked class methods
+// FORCEINLINE implementation of the Interlocked class methods
 //
 
 #ifndef __GCENV_INTERLOCKED_INL__
@@ -11,7 +11,7 @@
 #endif // _MSC_VER
 
 #ifndef _MSC_VER
-__forceinline void Interlocked::InterlockedOperationBarrier()
+FORCEINLINE void Interlocked::InterlockedOperationBarrier()
 {
 #if defined(HOST_ARM64) || defined(HOST_LOONGARCH64) || defined(HOST_RISCV64)
     // See PAL_InterlockedOperationBarrier() in the PAL
@@ -26,7 +26,7 @@ __forceinline void Interlocked::InterlockedOperationBarrier()
 // Return:
 //  The resulting incremented value
 template <typename T>
-__forceinline T Interlocked::Increment(T volatile *addend)
+FORCEINLINE T Interlocked::Increment(T volatile *addend)
 {
 #ifdef _MSC_VER
     static_assert(sizeof(long) == sizeof(T), "Size of long must be the same as size of T");
@@ -44,7 +44,7 @@ __forceinline T Interlocked::Increment(T volatile *addend)
 // Return:
 //  The resulting decremented value
 template <typename T>
-__forceinline T Interlocked::Decrement(T volatile *addend)
+FORCEINLINE T Interlocked::Decrement(T volatile *addend)
 {
 #ifdef _MSC_VER
     static_assert(sizeof(long) == sizeof(T), "Size of long must be the same as size of T");
@@ -63,7 +63,7 @@ __forceinline T Interlocked::Decrement(T volatile *addend)
 // Return:
 //  The previous value of the destination
 template <typename T>
-__forceinline T Interlocked::Exchange(T volatile *destination, T value)
+FORCEINLINE T Interlocked::Exchange(T volatile *destination, T value)
 {
 #ifdef _MSC_VER
     static_assert(sizeof(long) == sizeof(T), "Size of long must be the same as size of T");
@@ -84,7 +84,7 @@ __forceinline T Interlocked::Exchange(T volatile *destination, T value)
 // Return:
 //  The original value of the destination
 template <typename T>
-__forceinline T Interlocked::CompareExchange(T volatile *destination, T exchange, T comparand)
+FORCEINLINE T Interlocked::CompareExchange(T volatile *destination, T exchange, T comparand)
 {
 #ifdef _MSC_VER
     static_assert(sizeof(long) == sizeof(T), "Size of long must be the same as size of T");
@@ -103,7 +103,7 @@ __forceinline T Interlocked::CompareExchange(T volatile *destination, T exchange
 // Return:
 //  The previous value of the addend
 template <typename T>
-__forceinline T Interlocked::ExchangeAdd(T volatile *addend, T value)
+FORCEINLINE T Interlocked::ExchangeAdd(T volatile *addend, T value)
 {
 #ifdef _MSC_VER
     static_assert(sizeof(long) == sizeof(T), "Size of long must be the same as size of T");
@@ -116,7 +116,7 @@ __forceinline T Interlocked::ExchangeAdd(T volatile *addend, T value)
 }
 
 template <typename T>
-__forceinline T Interlocked::ExchangeAdd64(T volatile* addend, T value)
+FORCEINLINE T Interlocked::ExchangeAdd64(T volatile* addend, T value)
 {
 #ifdef _MSC_VER
     static_assert(sizeof(int64_t) == sizeof(T), "Size of LONGLONG must be the same as size of T");
@@ -129,7 +129,7 @@ __forceinline T Interlocked::ExchangeAdd64(T volatile* addend, T value)
 }
 
 template <typename T>
-__forceinline T Interlocked::ExchangeAddPtr(T volatile* addend, T value)
+FORCEINLINE T Interlocked::ExchangeAddPtr(T volatile* addend, T value)
 {
 #ifdef _MSC_VER
 #ifdef HOST_64BIT
@@ -151,7 +151,7 @@ __forceinline T Interlocked::ExchangeAddPtr(T volatile* addend, T value)
 //  destination - the first operand and the destination
 //  value       - second operand
 template <typename T>
-__forceinline void Interlocked::And(T volatile *destination, T value)
+FORCEINLINE void Interlocked::And(T volatile *destination, T value)
 {
 #ifdef _MSC_VER
     static_assert(sizeof(long) == sizeof(T), "Size of long must be the same as size of T");
@@ -167,7 +167,7 @@ __forceinline void Interlocked::And(T volatile *destination, T value)
 //  destination - the first operand and the destination
 //  value       - second operand
 template <typename T>
-__forceinline void Interlocked::Or(T volatile *destination, T value)
+FORCEINLINE void Interlocked::Or(T volatile *destination, T value)
 {
 #ifdef _MSC_VER
     static_assert(sizeof(long) == sizeof(T), "Size of long must be the same as size of T");
@@ -185,7 +185,7 @@ __forceinline void Interlocked::Or(T volatile *destination, T value)
 // Return:
 //  The previous value of the destination
 template <typename T>
-__forceinline T Interlocked::ExchangePointer(T volatile * destination, T value)
+FORCEINLINE T Interlocked::ExchangePointer(T volatile * destination, T value)
 {
 #ifdef _MSC_VER
 #ifdef HOST_64BIT
@@ -201,7 +201,7 @@ __forceinline T Interlocked::ExchangePointer(T volatile * destination, T value)
 }
 
 template <typename T>
-__forceinline T Interlocked::ExchangePointer(T volatile * destination, std::nullptr_t value)
+FORCEINLINE T Interlocked::ExchangePointer(T volatile * destination, std::nullptr_t value)
 {
 #ifdef _MSC_VER
 #ifdef HOST_64BIT
@@ -225,7 +225,7 @@ __forceinline T Interlocked::ExchangePointer(T volatile * destination, std::null
 // Return:
 //  The original value of the destination
 template <typename T>
-__forceinline T Interlocked::CompareExchangePointer(T volatile *destination, T exchange, T comparand)
+FORCEINLINE T Interlocked::CompareExchangePointer(T volatile *destination, T exchange, T comparand)
 {
 #ifdef _MSC_VER
 #ifdef HOST_64BIT
@@ -241,7 +241,7 @@ __forceinline T Interlocked::CompareExchangePointer(T volatile *destination, T e
 }
 
 template <typename T>
-__forceinline T Interlocked::CompareExchangePointer(T volatile *destination, T exchange, std::nullptr_t comparand)
+FORCEINLINE T Interlocked::CompareExchangePointer(T volatile *destination, T exchange, std::nullptr_t comparand)
 {
 #ifdef _MSC_VER
 #ifdef HOST_64BIT

diff --git a/src/coreclr/gc/env/gcenv.unix.inl b/src/coreclr/gc/env/gcenv.unix.inl
@@ -11,7 +11,7 @@ extern uint32_t g_pageSizeUnixInl;
 #define OS_PAGE_SIZE GCToOSInterface::GetPageSize()
 
 #ifndef DACCESS_COMPILE
-__forceinline size_t GCToOSInterface::GetPageSize()
+FORCEINLINE size_t GCToOSInterface::GetPageSize()
 {
     return g_pageSizeUnixInl;
 }

diff --git a/src/coreclr/gc/env/gcenv.windows.inl b/src/coreclr/gc/env/gcenv.windows.inl
@@ -9,7 +9,7 @@
 
 #define OS_PAGE_SIZE GCToOSInterface::GetPageSize()
 
-__forceinline size_t GCToOSInterface::GetPageSize()
+FORCEINLINE size_t GCToOSInterface::GetPageSize()
 {
     return 0x1000;
 }

diff --git a/src/coreclr/gc/gceventstatus.h b/src/coreclr/gc/gceventstatus.h
@@ -60,7 +60,7 @@ class GCEventStatus
      * IsEnabled queries whether or not the given level and keyword are
      * enabled on the given provider, returning true if they are.
      */
-    __forceinline static bool IsEnabled(GCEventProvider provider, GCEventKeyword keyword, GCEventLevel level)
+    FORCEINLINE static bool IsEnabled(GCEventProvider provider, GCEventKeyword keyword, GCEventLevel level)
     {
         assert(level >= GCEventLevel_None && level < GCEventLevel_Max);
 

diff --git a/src/coreclr/gc/handletablecore.cpp b/src/coreclr/gc/handletablecore.cpp
@@ -685,7 +685,7 @@ void SegmentRemoveFreeBlocks(TableSegment *pSegment, uint32_t uType, BOOL *pfSca
 
 #ifdef HANDLE_OPTIMIZE_FOR_64_HANDLE_BLOCKS
         // determine whether this block is empty
-        if (((uint64_t*)pSegment->rgFreeMask)[uBlock] == UI64(0xFFFFFFFFFFFFFFFF))
+        if (((uint64_t*)pSegment->rgFreeMask)[uBlock] == 0xFFFFFFFFFFFFFFFFULL)
 #else
         // assume this block is empty until we know otherwise
         BOOL fEmpty = TRUE;
@@ -1039,7 +1039,7 @@ void SegmentResortChains(TableSegment *pSegment)
             {
 #ifdef HANDLE_OPTIMIZE_FOR_64_HANDLE_BLOCKS
                 // determine whether this block is empty
-                if (((uint64_t*)pSegment->rgFreeMask)[uBlock] == UI64(0xFFFFFFFFFFFFFFFF))
+                if (((uint64_t*)pSegment->rgFreeMask)[uBlock] == 0xFFFFFFFFFFFFFFFFULL)
 #else
                 // assume this block is empty until we know otherwise
                 BOOL fEmpty = TRUE;

diff --git a/src/coreclr/gc/unix/gcenv.unix.cpp b/src/coreclr/gc/unix/gcenv.unix.cpp
@@ -36,10 +36,6 @@
 #undef min
 #undef max
 
-#ifndef __has_cpp_attribute
-#define __has_cpp_attribute(x) (0)
-#endif
-
 #include <algorithm>
 
 #if HAVE_SYS_TIME_H

diff --git a/src/coreclr/gc/vxsort/defs.h b/src/coreclr/gc/vxsort/defs.h
@@ -4,6 +4,8 @@
 #ifndef VXSORT_DEFS_H
 #define VXSORT_DEFS_H
 
+#include <minipal/utils.h>
+
 #if _MSC_VER
 #ifdef _M_X86
 #define ARCH_X86
@@ -29,22 +31,18 @@
 #ifdef _MSC_VER
 #ifdef __clang__
 #define mess_up_cmov()
-#define INLINE __attribute__((always_inline))
-#define NOINLINE __attribute__((noinline))
 #else
 // MSVC
 #include <intrin.h>
 #define mess_up_cmov() _ReadBarrier();
-#define INLINE __forceinline
-#define NOINLINE __declspec(noinline)
 #endif
 #else
 // GCC + Clang
 #define mess_up_cmov()
-#define INLINE __attribute__((always_inline))
-#define NOINLINE __attribute__((noinline))
 #endif
 
+#define INLINE FORCEINLINE
+
 using std::max;
 using std::min;
 #endif  // VXSORT_DEFS_H
diff --git a/src/coreclr/gcinfo/gcinfodumper.cpp b/src/coreclr/gcinfo/gcinfodumper.cpp
@@ -17,7 +17,7 @@
 #ifdef HOST_64BIT
 // All stack offsets are INT32's, so this guarantees a disjoint range of
 // addresses for each register.
-#define ADDRESS_SPACING UI64(0x100000000)
+#define ADDRESS_SPACING 0x100000000ULL
 #elif defined(TARGET_ARM)
 #define ADDRESS_SPACING 0x100000
 #else

diff --git a/src/coreclr/ilasm/grammar_after.cpp b/src/coreclr/ilasm/grammar_after.cpp
@@ -1200,8 +1200,8 @@ int yylex()
         begNum = curPos;
         {
             uint64_t i64 = str2uint64(begNum, const_cast<const char**>(&curPos), radix);
-            uint64_t mask64 = neg ? UI64(0xFFFFFFFF80000000) : UI64(0xFFFFFFFF00000000);
-            uint64_t largestNegVal32 = UI64(0x0000000080000000);
+            uint64_t mask64 = neg ? 0xFFFFFFFF80000000ULL : 0xFFFFFFFF00000000ULL;
+            uint64_t largestNegVal32 = 0x0000000080000000ULL;
             if ((i64 & mask64) && (i64 != largestNegVal32))
             {
                 yylval.int64 = new int64_t(i64);

diff --git a/src/coreclr/ilasm/method.hpp b/src/coreclr/ilasm/method.hpp
@@ -56,7 +56,7 @@ struct  ARG_NAME_LIST
     DWORD     dwAttr;
     CustomDescrList CustDList;
     ARG_NAME_LIST *pNext;
-    __forceinline ARG_NAME_LIST(int i, LPCUTF8 sz, BinStr *pbSig, BinStr *pbMarsh, DWORD attr)
+    FORCEINLINE ARG_NAME_LIST(int i, LPCUTF8 sz, BinStr *pbSig, BinStr *pbMarsh, DWORD attr)
     {
         nNum = i;
         //dwName = (DWORD)strlen(sz);

diff --git a/src/coreclr/ilasm/writer.cpp b/src/coreclr/ilasm/writer.cpp
@@ -1238,7 +1238,7 @@ HRESULT Assembler::CreatePEFile(_In_ __nullterminated WCHAR *pwzOutputFilename)
             if(m_dwCeeFileFlags & ICEE_CREATE_FILE_PE64)
             {
                 ULONGLONG *pdw = new ULONGLONG[N];
-                for(i=0; i<N; i++) pdw[i] = UI64(0xdeadbeefdeadbeef);
+                for(i=0; i<N; i++) pdw[i] = 0xdeadbeefdeadbeefULL;
                 EmitData(pdw,sizeof(ULONGLONG)*N);
                 m_VTFList.PUSH(new VTFEntry((USHORT)N,COR_VTABLE_64BIT|COR_VTABLE_FROM_UNMANAGED,sz));
                 delete [] pdw;

diff --git a/src/coreclr/ildasm/dasm.cpp b/src/coreclr/ildasm/dasm.cpp
@@ -5857,8 +5857,8 @@ IMetaDataTables *pITables = NULL;
 //int   size, size2;
 int   metaSize = 0;
 int64_t fTableSeen;
-inline void TableSeen(unsigned long n) { fTableSeen |= (I64(1) << n); }
-inline int IsTableSeen(unsigned long n) { return (fTableSeen & (I64(1) << n)) ? 1 : 0;}
+inline void TableSeen(unsigned long n) { fTableSeen |= (1LL << n); }
+inline int IsTableSeen(unsigned long n) { return (fTableSeen & (1LL << n)) ? 1 : 0;}
 inline void TableSeenReset() { fTableSeen = 0;}
 
 void DumpTable(unsigned long Table, const char *TableName, void* GUICookie)