https://github.com/GkvJwa updated https://github.com/llvm/llvm-project/pull/196886
>From e73ebdec7f67e5673fa48c85756586689a6241ea Mon Sep 17 00:00:00 2001 From: GkvJwa <[email protected]> Date: Tue, 12 May 2026 14:55:36 +0800 Subject: [PATCH] [clang] Align x86 CR/DR intrinsic declarations with MSVC Align CR/DR and related MSR intrinsic declarations in intrin.h with MSVC's x86/x64 signatures Fixes #185457 --- clang/lib/Headers/intrin.h | 24 ++++++++++------- clang/test/Headers/ms-intrin.cpp | 45 ++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/clang/lib/Headers/intrin.h b/clang/lib/Headers/intrin.h index 210ed0c1f773b..e5d08a217e05e 100644 --- a/clang/lib/Headers/intrin.h +++ b/clang/lib/Headers/intrin.h @@ -44,8 +44,10 @@ #if __x86_64__ #define __LPTRINT_TYPE__ __int64 +#define __IPTRINT_TYPE__ __int64 #else #define __LPTRINT_TYPE__ long +#define __IPTRINT_TYPE__ int #endif #ifdef __cplusplus @@ -95,12 +97,12 @@ void __outdword(unsigned short, unsigned long); void __outdwordstring(unsigned short, unsigned long *, unsigned long); void __outword(unsigned short, unsigned short); void __outwordstring(unsigned short, unsigned short *, unsigned long); -unsigned long __readcr0(void); -unsigned long __readcr2(void); +unsigned __LPTRINT_TYPE__ __readcr0(void); +unsigned __LPTRINT_TYPE__ __readcr2(void); unsigned __LPTRINT_TYPE__ __readcr3(void); unsigned __LPTRINT_TYPE__ __readcr4(void); -unsigned __int64 __readcr8(void); -unsigned int __readdr(unsigned int); +unsigned __LPTRINT_TYPE__ __readcr8(void); +unsigned __IPTRINT_TYPE__ __readdr(unsigned int); #ifdef __i386__ unsigned char __readfsbyte(unsigned long); unsigned short __readfsword(unsigned long); @@ -126,11 +128,12 @@ unsigned __int64 __ull_rshift(unsigned __int64, int); void __vmx_off(void); void __vmx_vmptrst(unsigned __int64 *); void __wbinvd(void); -void __writecr0(unsigned int); -void __writecr3(unsigned __INTPTR_TYPE__); -void __writecr4(unsigned __INTPTR_TYPE__); -void __writecr8(unsigned __int64); -void __writedr(unsigned int, unsigned int); +void __writecr0(unsigned __IPTRINT_TYPE__); +void __writecr2(unsigned __IPTRINT_TYPE__); +void __writecr3(unsigned __IPTRINT_TYPE__); +void __writecr4(unsigned __IPTRINT_TYPE__); +void __writecr8(unsigned __IPTRINT_TYPE__); +void __writedr(unsigned int, unsigned __IPTRINT_TYPE__); void __writefsbyte(unsigned long, unsigned char); void __writefsdword(unsigned long, unsigned long); void __writefsqword(unsigned long, unsigned __int64); @@ -474,7 +477,7 @@ static __inline__ unsigned __LPTRINT_TYPE__ __DEFAULT_FN_ATTRS __readcr3(void) { } static __inline__ void __DEFAULT_FN_ATTRS -__writecr3(unsigned __INTPTR_TYPE__ __cr3_val) { +__writecr3(unsigned __IPTRINT_TYPE__ __cr3_val) { __asm__ ("mov {%0, %%cr3|cr3, %0}" : : "r"(__cr3_val) : "memory"); } #endif @@ -484,6 +487,7 @@ __writecr3(unsigned __INTPTR_TYPE__ __cr3_val) { #endif #undef __LPTRINT_TYPE__ +#undef __IPTRINT_TYPE__ #undef __DEFAULT_FN_ATTRS diff --git a/clang/test/Headers/ms-intrin.cpp b/clang/test/Headers/ms-intrin.cpp index 985f8577c46bf..d7a419b371e12 100644 --- a/clang/test/Headers/ms-intrin.cpp +++ b/clang/test/Headers/ms-intrin.cpp @@ -44,6 +44,51 @@ typedef __SIZE_TYPE__ size_t; template <typename T> void foo(T V) {} +#if defined(_M_X64) && !defined(_M_ARM64EC) +static_assert(__is_same(decltype(__readcr0()), unsigned __int64), ""); +static_assert(__is_same(decltype(__readcr2()), unsigned __int64), ""); +static_assert(__is_same(decltype(__readcr3()), unsigned __int64), ""); +static_assert(__is_same(decltype(__readcr4()), unsigned __int64), ""); +static_assert(__is_same(decltype(__readcr8()), unsigned __int64), ""); +static_assert(__is_same(decltype(__readdr(0)), unsigned __int64), ""); +static_assert(__is_same(decltype(__readeflags()), unsigned __int64), ""); +static_assert(__is_same(decltype(__readmsr(0)), unsigned __int64), ""); +static_assert(__is_same(decltype(&__writecr0), void (*)(unsigned __int64)), ""); +static_assert(__is_same(decltype(&__writecr2), void (*)(unsigned __int64)), ""); +static_assert(__is_same(decltype(&__writecr3), void (*)(unsigned __int64)), ""); +static_assert(__is_same(decltype(&__writecr4), void (*)(unsigned __int64)), ""); +static_assert(__is_same(decltype(&__writecr8), void (*)(unsigned __int64)), ""); +static_assert(__is_same(decltype(&__writedr), + void (*)(unsigned int, unsigned __int64)), + ""); +static_assert(__is_same(decltype(&__writeeflags), void (*)(unsigned __int64)), + ""); +static_assert(__is_same(decltype(&__writemsr), + void (*)(unsigned long, unsigned __int64)), + ""); +#elif defined(_M_IX86) +static_assert(__is_same(decltype(__readcr0()), unsigned long), ""); +static_assert(__is_same(decltype(__readcr2()), unsigned long), ""); +static_assert(__is_same(decltype(__readcr3()), unsigned long), ""); +static_assert(__is_same(decltype(__readcr4()), unsigned long), ""); +static_assert(__is_same(decltype(__readcr8()), unsigned long), ""); +static_assert(__is_same(decltype(__readdr(0)), unsigned int), ""); +static_assert(__is_same(decltype(__readeflags()), unsigned int), ""); +static_assert(__is_same(decltype(__readmsr(0)), unsigned __int64), ""); +static_assert(__is_same(decltype(&__writecr0), void (*)(unsigned int)), ""); +static_assert(__is_same(decltype(&__writecr2), void (*)(unsigned int)), ""); +static_assert(__is_same(decltype(&__writecr3), void (*)(unsigned int)), ""); +static_assert(__is_same(decltype(&__writecr4), void (*)(unsigned int)), ""); +static_assert(__is_same(decltype(&__writecr8), void (*)(unsigned int)), ""); +static_assert(__is_same(decltype(&__writedr), + void (*)(unsigned int, unsigned int)), + ""); +static_assert(__is_same(decltype(&__writeeflags), void (*)(unsigned int)), ""); +static_assert(__is_same(decltype(&__writemsr), + void (*)(unsigned long, unsigned __int64)), + ""); +#endif + // __asm__ blocks are only checked for inline functions that end up being // emitted, so call functions with __asm__ blocks to make sure their inline // assembly parses. _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
