[clang] e95040f - [clang][Interp] Implement __builtin_popcountg (#84500)
via cfe-commits
cfe-commits at lists.llvm.org
Sat Mar 9 21:54:06 PST 2024
Author: OverMighty
Date: 2024-03-10T06:54:03+01:00
New Revision: e95040f0f05b74406e9d7ee02b110470588cc5f0
URL: https://github.com/llvm/llvm-project/commit/e95040f0f05b74406e9d7ee02b110470588cc5f0
DIFF: https://github.com/llvm/llvm-project/commit/e95040f0f05b74406e9d7ee02b110470588cc5f0.diff
LOG: [clang][Interp] Implement __builtin_popcountg (#84500)
The previous code would truncate IntegerAPs wider than 64 bits.
Added:
Modified:
clang/lib/AST/Interp/InterpBuiltin.cpp
clang/test/AST/Interp/builtin-functions.cpp
Removed:
################################################################################
diff --git a/clang/lib/AST/Interp/InterpBuiltin.cpp b/clang/lib/AST/Interp/InterpBuiltin.cpp
index 5250d02be85a61..c500b9d502d707 100644
--- a/clang/lib/AST/Interp/InterpBuiltin.cpp
+++ b/clang/lib/AST/Interp/InterpBuiltin.cpp
@@ -53,11 +53,7 @@ static APSInt peekToAPSInt(InterpStack &Stk, PrimType T, size_t Offset = 0) {
Offset = align(primSize(T));
APSInt R;
- INT_TYPE_SWITCH(T, {
- T Val = Stk.peek<T>(Offset);
- R = APSInt(APInt(Val.bitWidth(), static_cast<uint64_t>(Val), T::isSigned()),
- !T::isSigned());
- });
+ INT_TYPE_SWITCH(T, R = Stk.peek<T>(Offset).toAPSInt());
return R;
}
@@ -1052,6 +1048,7 @@ bool InterpretBuiltin(InterpState &S, CodePtr OpPC, const Function *F,
case Builtin::BI__builtin_popcount:
case Builtin::BI__builtin_popcountl:
case Builtin::BI__builtin_popcountll:
+ case Builtin::BI__builtin_popcountg:
case Builtin::BI__popcnt16: // Microsoft variants of popcount
case Builtin::BI__popcnt:
case Builtin::BI__popcnt64:
diff --git a/clang/test/AST/Interp/builtin-functions.cpp b/clang/test/AST/Interp/builtin-functions.cpp
index ab8abac4b36e34..08fca8428cf5e8 100644
--- a/clang/test/AST/Interp/builtin-functions.cpp
+++ b/clang/test/AST/Interp/builtin-functions.cpp
@@ -268,6 +268,24 @@ namespace popcount {
static_assert(__builtin_popcountl(0) == 0, "");
static_assert(__builtin_popcountll(~0ull) == __CHAR_BIT__ * sizeof(unsigned long long), "");
static_assert(__builtin_popcountll(0) == 0, "");
+ static_assert(__builtin_popcountg((unsigned char)~0) == __CHAR_BIT__ * sizeof(unsigned char), "");
+ static_assert(__builtin_popcountg((unsigned char)0) == 0, "");
+ static_assert(__builtin_popcountg((unsigned short)~0) == __CHAR_BIT__ * sizeof(unsigned short), "");
+ static_assert(__builtin_popcountg((unsigned short)0) == 0, "");
+ static_assert(__builtin_popcountg(~0u) == __CHAR_BIT__ * sizeof(unsigned int), "");
+ static_assert(__builtin_popcountg(0u) == 0, "");
+ static_assert(__builtin_popcountg(~0ul) == __CHAR_BIT__ * sizeof(unsigned long), "");
+ static_assert(__builtin_popcountg(0ul) == 0, "");
+ static_assert(__builtin_popcountg(~0ull) == __CHAR_BIT__ * sizeof(unsigned long long), "");
+ static_assert(__builtin_popcountg(0ull) == 0, "");
+#ifdef __SIZEOF_INT128__
+ static_assert(__builtin_popcountg(~(unsigned __int128)0) == __CHAR_BIT__ * sizeof(unsigned __int128), "");
+ static_assert(__builtin_popcountg((unsigned __int128)0) == 0, "");
+#endif
+#ifndef __AVR__
+ static_assert(__builtin_popcountg(~(unsigned _BitInt(128))0) == __CHAR_BIT__ * sizeof(unsigned _BitInt(128)), "");
+ static_assert(__builtin_popcountg((unsigned _BitInt(128))0) == 0, "");
+#endif
/// From test/Sema/constant-builtins-2.c
char popcount1[__builtin_popcount(0) == 0 ? 1 : -1];
@@ -280,6 +298,17 @@ namespace popcount {
char popcount8[__builtin_popcountll(0LL) == 0 ? 1 : -1];
char popcount9[__builtin_popcountll(0xF0F0LL) == 8 ? 1 : -1];
char popcount10[__builtin_popcountll(~0LL) == BITSIZE(long long) ? 1 : -1];
+ char popcount11[__builtin_popcountg(0U) == 0 ? 1 : -1];
+ char popcount12[__builtin_popcountg(0xF0F0U) == 8 ? 1 : -1];
+ char popcount13[__builtin_popcountg(~0U) == BITSIZE(int) ? 1 : -1];
+ char popcount14[__builtin_popcountg(~0UL) == BITSIZE(long) ? 1 : -1];
+ char popcount15[__builtin_popcountg(~0ULL) == BITSIZE(long long) ? 1 : -1];
+#ifdef __SIZEOF_INT128__
+ char popcount16[__builtin_popcountg(~(unsigned __int128)0) == BITSIZE(__int128) ? 1 : -1];
+#endif
+#ifndef __AVR__
+ char popcount17[__builtin_popcountg(~(unsigned _BitInt(128))0) == BITSIZE(_BitInt(128)) ? 1 : -1];
+#endif
}
namespace parity {
More information about the cfe-commits
mailing list