Merge commit '4d07c7f9a08b' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit fc9d5325917b · 2025-07-08T11:08:45.000+03:00
diff --git a/clang-tools-extra/clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp b/clang-tools-extra/clang-tidy/bugprone/TaggedUnionMemberCountCheck.cpp
@@ -144,7 +144,8 @@ TaggedUnionMemberCountCheck::getNumberOfEnumValues(const EnumDecl *ED) {
 
   if (EnableCountingEnumHeuristic && LastEnumConstant &&
       isCountingEnumLikeName(LastEnumConstant->getName()) &&
-      (LastEnumConstant->getInitVal() == (EnumValues.size() - 1))) {
+      llvm::APSInt::isSameValue(LastEnumConstant->getInitVal(),
+                                llvm::APSInt::get(EnumValues.size() - 1))) {
     return {EnumValues.size() - 1, LastEnumConstant};
   }
 

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,8 @@ TaggedUnionMemberCountCheck::getNumberOfEnumValues(const EnumDecl *ED) {`
`144`	`144`
`145`	`145`	`if (EnableCountingEnumHeuristic && LastEnumConstant &&`
`146`	`146`	`isCountingEnumLikeName(LastEnumConstant->getName()) &&`
`147`		`- (LastEnumConstant->getInitVal() == (EnumValues.size() - 1))) {`
	`147`	`+ llvm::APSInt::isSameValue(LastEnumConstant->getInitVal(),`
	`148`	`+ llvm::APSInt::get(EnumValues.size() - 1))) {`
`148`	`149`	`return {EnumValues.size() - 1, LastEnumConstant};`
`149`	`150`	`}`
`150`	`151`