[clang-tidy][NFC] fix compilation by disambiguating equality operator #147048
Conversation
|
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
|
@llvm/pr-subscribers-clang-tools-extra @llvm/pr-subscribers-clang-tidy Author: Gregor Jasny (gjasny) ChangesThis 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: 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 Thanks, Full diff: https://github.com/llvm/llvm-project/pull/147048.diff 1 Files Affected:
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};
}
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
gjasny
force-pushed
the
bugfix/gjasny/fix-ubuntu2204-clang14-cxx20
branch
from
7452d3c to
2585b9c
Compare
clang-tools-extra/clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp
Outdated
Show resolved
Hide resolved
gjasny
force-pushed
the
bugfix/gjasny/fix-ubuntu2204-clang14-cxx20
branch
from
2585b9c to
df2f97d
Compare
Current standard that LLVM use is c++17. But we generally should support compilers at least 3 years of compilers.
I don't have much knowledge on cherry-picking to release, but the latest release of 20.x could be on Jul 8th (if it even happens, see https://llvm.org/). I have a slight feeling that it's not worth cherry-picking, If LLVM is compiled from source, would it be feasible to just use 21st LLVM branch that will be released soon, gjasny? |
vbvictor
changed the title
clang-tools-extra/clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp
Outdated
Show resolved
Hide resolved
Correct, but we also want to support being able to compile with C++20. I think there are build bots for that set up.
The compile error is in a cpp file, so it would only happen to people compiling the clang-tidy libs with C++20 which has an even smaller chance of happening, but still. IMO this should just go into LLVM 20, it's a trivial fix. |
I don't oppose, then just note that we don't have much time till 20th final release. |
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]>
gjasny
force-pushed
the
bugfix/gjasny/fix-ubuntu2204-clang14-cxx20
branch
from
df2f97d to
f1ff857
Compare
|
All builds are green, now. |
| @@ -144,7 +144,9 @@ TaggedUnionMemberCountCheck::getNumberOfEnumValues(const EnumDecl *ED) { | |||
|
|
|||
| if (EnableCountingEnumHeuristic && LastEnumConstant && | |||
| isCountingEnumLikeName(LastEnumConstant->getName()) && | |||
| (LastEnumConstant->getInitVal() == (EnumValues.size() - 1))) { | |||
| llvm::APSInt::compareValues(LastEnumConstant->getInitVal(), | |||
There was a problem hiding this comment.
Could use llvm::APSInt::isSameValue to avoid strange formatting
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:
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.xbranch?Thanks,
Gregor