https://github.com/gjasny created
https://github.com/llvm/llvm-project/pull/147048
This fixes an issue compiling LLVM 20.1.7 on Ubuntu 22.04 with the Ubuntu
provided Clang 14 and C++20. That's probably happening due to incomplete C++20
support in either Clang 14 or the GNU libstdc++ 12.
The actual error is:
```
[1/8] Building CXX object
tools/clang/tools/extra/clang-tidy/bugprone/CMakeFiles/obj.clangTidyBugproneModule.dir/TaggedUnionMemberCountCheck.cpp.o
FAILED:
tools/clang/tools/extra/clang-tidy/bugprone/CMakeFiles/obj.clangTidyBugproneModule.dir/TaggedUnionMemberCountCheck.cpp.o
/usr/lib/llvm-14/bin/clang++ -DGTEST_HAS_RTTI=0 -D_GNU_SOURCE
-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
-I/home/gregorj/Git/el/libclang/_build_cxx20_clang14_r/LocalLLVM-prefix/src/LocalLLVM-build/tools/clang/tools/extra/clang-tidy/bugprone
-I/home/gregorj/Git/el/libclang/llvm-project/clang-tools-extra/clang-tidy/bugprone
-I/home/gregorj/Git/el/libclang/_build_cxx20_clang14_r/LocalLLVM-prefix/src/LocalLLVM-build/tools/clang/tools/extra/clang-tidy
-I/home/gregorj/Git/el/libclang/llvm-project/clang/include
-I/home/gregorj/Git/el/libclang/_build_cxx20_clang14_r/LocalLLVM-prefix/src/LocalLLVM-build/tools/clang/include
-I/home/gregorj/Git/el/libclang/_build_cxx20_clang14_r/LocalLLVM-prefix/src/LocalLLVM-build/include
-I/home/gregorj/Git/el/libclang/llvm-project/llvm/include
-fvisibility-inlines-hidden -Werror=date-time
-Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter
-Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic
-Wno-long-long -Wc++98-compat-extra-semi -Wimplicit-fallthrough
-Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor
-Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion
-Wmisleading-indentation -Wctad-maybe-unsupported -fdiagnostics-color
-ffunction-sections -fdata-sections -fno-common -Woverloaded-virtual
-Wno-nested-anon-types -O3 -DNDEBUG -std=c++20 -fno-exceptions -funwind-tables
-fno-rtti -MD -MT
tools/clang/tools/extra/clang-tidy/bugprone/CMakeFiles/obj.clangTidyBugproneModule.dir/TaggedUnionMemberCountCheck.cpp.o
-MF
tools/clang/tools/extra/clang-tidy/bugprone/CMakeFiles/obj.clangTidyBugproneModule.dir/TaggedUnionMemberCountCheck.cpp.o.d
-o
tools/clang/tools/extra/clang-tidy/bugprone/CMakeFiles/obj.clangTidyBugproneModule.dir/TaggedUnionMemberCountCheck.cpp.o
-c
/home/gregorj/Git/el/libclang/llvm-project/clang-tools-extra/clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp
/home/gregorj/Git/el/libclang/llvm-project/clang-tools-extra/clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp:148:39:
error: use of overloaded operator '==' is ambiguous (with operand types
'llvm::APSInt' and 'unsigned long')
(LastEnumConstant->getInitVal() == (EnumValues.size() - 1))) {
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~
/home/gregorj/Git/el/libclang/llvm-project/llvm/include/llvm/ADT/APInt.h:2080:13:
note: candidate function (with reversed parameter order)
inline bool operator==(uint64_t V1, const APInt &V2) { return V2 == V1; }
^
/home/gregorj/Git/el/libclang/llvm-project/llvm/include/llvm/ADT/APSInt.h:188:8:
note: candidate function
bool operator==(int64_t RHS) const {
^
/home/gregorj/Git/el/libclang/llvm-project/llvm/include/llvm/ADT/APSInt.h:357:13:
note: candidate function (with reversed parameter order)
inline bool operator==(int64_t V1, const APSInt &V2) { return V2 == V1; }
^
1 error generated.
```
I know that clang-14 in combination with the GNU libstdc++ 12 might not be 100%
C++20 compliant. But this is the only error we see when compiling LLVM 20.1.7
and it looks very fixable. Would it be possible to cherry-pick the fix to the
`release/20.x` branch?
Thanks,
Gregor
>From 7452d3c042431bec2443d93b90ea89e394ef8bd9 Mon Sep 17 00:00:00 2001
From: Gregor Jasny <[email protected]>
Date: Fri, 4 Jul 2025 13:19:22 +0100
Subject: [PATCH] [clang-tidy] fix compilation by disambiguating equality
operator
This fixes a compilation issue on Ubuntu 22.04 with the Ubuntu
provided Clang 14 and C++20. That's probably happening due to
incomplete C++20 support in either Clang 14 or the GNU libstdc++ 12.
Signed-off-by: Gregor Jasny <[email protected]>
---
.../clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/clang-tools-extra/clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp
b/clang-tools-extra/clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp
index db0ac281ddfcf..7a4d43fc49320 100644
--- a/clang-tools-extra/clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp
+++ b/clang-tools-extra/clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp
@@ -144,7 +144,7 @@ TaggedUnionMemberCountCheck::getNumberOfEnumValues(const
EnumDecl *ED) {
if (EnableCountingEnumHeuristic && LastEnumConstant &&
isCountingEnumLikeName(LastEnumConstant->getName()) &&
- (LastEnumConstant->getInitVal() == (EnumValues.size() - 1))) {
+ (LastEnumConstant->getInitVal() ==
llvm::APSInt::getUnsigned(EnumValues.size() - 1u))) {
return {EnumValues.size() - 1, LastEnumConstant};
}
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
