From 35f3927af32c9c077c7df7a35de76a5e6fdb6149 Mon Sep 17 00:00:00 2001 From: David Bayer <48736217+davebayer@users.noreply.github.com> Date: Mon, 16 Mar 2026 15:23:22 +0100 Subject: [PATCH] Add fallback for `_CCCL_BUILTIN_EXPECT` (#8043) (cherry picked from commit 5c44b159d03986a1d6c468343a95045278e61d86) --- libcudacxx/include/cuda/std/__cccl/builtin.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libcudacxx/include/cuda/std/__cccl/builtin.h b/libcudacxx/include/cuda/std/__cccl/builtin.h index 0ab81891842..5086f175e2b 100644 --- a/libcudacxx/include/cuda/std/__cccl/builtin.h +++ b/libcudacxx/include/cuda/std/__cccl/builtin.h @@ -115,8 +115,10 @@ #endif // _CCCL_CHECK_BUILTIN(builtin_constant_p) #if _CCCL_CHECK_BUILTIN(builtin_expect) || _CCCL_COMPILER(MSVC) || _CCCL_COMPILER(GCC) -# define _CCCL_BUILTIN_EXPECT(...) __builtin_expect(__VA_ARGS__) -#endif // _CCCL_CHECK_BUILTIN(builtin_expect) +# define _CCCL_BUILTIN_EXPECT(_EXPR, _VAL) __builtin_expect(_EXPR, _VAL) +#else // ^^^ has __builtin_expect ^^^ / vvv no __builtin_expect vvv +# define _CCCL_BUILTIN_EXPECT(_EXPR, _VAL) (_EXPR) +#endif // ^^^ no __builtin_expect ^^^ #if _CCCL_CHECK_BUILTIN(builtin_huge_valf) || _CCCL_COMPILER(MSVC) || _CCCL_COMPILER(GCC, <, 10) # define _CCCL_BUILTIN_HUGE_VALF() __builtin_huge_valf()