https://github.com/overmighty updated
https://github.com/llvm/llvm-project/pull/84318
>From 929165caaec24463763a2074f920253c8cb2ae44 Mon Sep 17 00:00:00 2001
From: OverMighty <its.overmig...@gmail.com>
Date: Thu, 7 Mar 2024 12:58:14 +0000
Subject: [PATCH 1/4] [clang] Implement constexpr support for
__builtin_popcountg
---
clang/docs/LanguageExtensions.rst | 1 +
clang/include/clang/Basic/Builtins.td | 2 +-
clang/lib/AST/ExprConstant.cpp | 1 +
clang/test/Sema/constant-builtins-2.c | 7 +++++++
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/clang/docs/LanguageExtensions.rst
b/clang/docs/LanguageExtensions.rst
index 2b54dffd058a35..06af93fd3c15ca 100644
--- a/clang/docs/LanguageExtensions.rst
+++ b/clang/docs/LanguageExtensions.rst
@@ -5378,6 +5378,7 @@ The following builtin intrinsics can be used in constant
expressions:
* ``__builtin_popcount``
* ``__builtin_popcountl``
* ``__builtin_popcountll``
+* ``__builtin_popcountg``
* ``__builtin_rotateleft8``
* ``__builtin_rotateleft16``
* ``__builtin_rotateleft32``
diff --git a/clang/include/clang/Basic/Builtins.td
b/clang/include/clang/Basic/Builtins.td
index a81131d82c4cb4..9c703377ca8d3e 100644
--- a/clang/include/clang/Basic/Builtins.td
+++ b/clang/include/clang/Basic/Builtins.td
@@ -706,7 +706,7 @@ def Popcount : Builtin, BitInt_Long_LongLongTemplate {
def Popcountg : Builtin {
let Spellings = ["__builtin_popcountg"];
- let Attributes = [NoThrow, Const, CustomTypeChecking];
+ let Attributes = [NoThrow, Const, Constexpr, CustomTypeChecking];
let Prototype = "int(...)";
}
diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp
index d8ca35740fbc35..4a7c7755e1d6fd 100644
--- a/clang/lib/AST/ExprConstant.cpp
+++ b/clang/lib/AST/ExprConstant.cpp
@@ -12483,6 +12483,7 @@ bool IntExprEvaluator::VisitBuiltinCallExpr(const
CallExpr *E,
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/Sema/constant-builtins-2.c
b/clang/test/Sema/constant-builtins-2.c
index 2bdd7b06daabfe..9ac0ddf94be4fe 100644
--- a/clang/test/Sema/constant-builtins-2.c
+++ b/clang/test/Sema/constant-builtins-2.c
@@ -237,6 +237,13 @@ char popcount7[__builtin_popcountl(~0L) == BITSIZE(long) ?
1 : -1];
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];
+char popcount15[__builtin_popcountg(~(unsigned __int128)0) ==
BITSIZE(__int128) ? 1 : -1];
+char popcount16[__builtin_popcountg(~(unsigned _BitInt(128))0) ==
BITSIZE(_BitInt(128)) ? 1 : -1];
char parity1[__builtin_parity(0) == 0 ? 1 : -1];
char parity2[__builtin_parity(0xb821) == 0 ? 1 : -1];
>From 4833baa179f3becc362013b64fbebbbe645ceca9 Mon Sep 17 00:00:00 2001
From: OverMighty <its.overmig...@gmail.com>
Date: Thu, 7 Mar 2024 16:57:36 +0000
Subject: [PATCH 2/4] fixup! [clang] Implement constexpr support for
__builtin_popcountg
---
clang/docs/ReleaseNotes.rst | 3 +++
1 file changed, 3 insertions(+)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 1b901a27fd19d1..2956e9e4647880 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -157,6 +157,9 @@ Non-comprehensive list of changes in this release
- ``__builtin_addc``, ``__builtin_subc``, and the other sizes of those
builtins are now constexpr and may be used in constant expressions.
+- Added ``__builtin_popcountg`` as a type-generic alternative to
+ ``__builtin_popcount{,l,ll}`` with support for any unsigned integer type.
+
New Compiler Flags
------------------
>From d6a0eae1a325dfa5036a8e617fdf02405bbb393d Mon Sep 17 00:00:00 2001
From: OverMighty <its.overmig...@gmail.com>
Date: Thu, 7 Mar 2024 17:11:17 +0000
Subject: [PATCH 3/4] fixup! [clang] Implement constexpr support for
__builtin_popcountg
---
clang/docs/ReleaseNotes.rst | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst
index 2956e9e4647880..43992e251d9e63 100644
--- a/clang/docs/ReleaseNotes.rst
+++ b/clang/docs/ReleaseNotes.rst
@@ -158,7 +158,9 @@ Non-comprehensive list of changes in this release
builtins are now constexpr and may be used in constant expressions.
- Added ``__builtin_popcountg`` as a type-generic alternative to
- ``__builtin_popcount{,l,ll}`` with support for any unsigned integer type.
+ ``__builtin_popcount{,l,ll}`` with support for any unsigned integer type.
Like
+ the previous builtins, this new builtin is constexpr and may be used in
+ constant expressions.
New Compiler Flags
------------------
>From cf66493c9242d3709b66a94ec965077ca3917dd7 Mon Sep 17 00:00:00 2001
From: OverMighty <its.overmig...@gmail.com>
Date: Thu, 7 Mar 2024 17:51:58 +0000
Subject: [PATCH 4/4] fixup! [clang] Implement constexpr support for
__builtin_popcountg
---
clang/test/Sema/constant-builtins-2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/clang/test/Sema/constant-builtins-2.c
b/clang/test/Sema/constant-builtins-2.c
index 9ac0ddf94be4fe..0935abe4c65fbe 100644
--- a/clang/test/Sema/constant-builtins-2.c
+++ b/clang/test/Sema/constant-builtins-2.c
@@ -242,8 +242,8 @@ 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];
-char popcount15[__builtin_popcountg(~(unsigned __int128)0) ==
BITSIZE(__int128) ? 1 : -1];
-char popcount16[__builtin_popcountg(~(unsigned _BitInt(128))0) ==
BITSIZE(_BitInt(128)) ? 1 : -1];
+char popcount16[__builtin_popcountg(~(unsigned __int128)0) ==
BITSIZE(__int128) ? 1 : -1];
+char popcount17[__builtin_popcountg(~(unsigned _BitInt(128))0) ==
BITSIZE(_BitInt(128)) ? 1 : -1];
char parity1[__builtin_parity(0) == 0 ? 1 : -1];
char parity2[__builtin_parity(0xb821) == 0 ? 1 : -1];
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
