https://github.com/whiteio updated
https://github.com/llvm/llvm-project/pull/116871
>From c69426607d63b3a0cf7d839c82cde55273a5f942 Mon Sep 17 00:00:00 2001
From: Chris White <chriswhiteio...@gmail.com>
Date: Tue, 19 Nov 2024 20:06:28 +0000
Subject: [PATCH 1/2] [Clang] Fix -Wunused-private-field false negative with
defaulted comparison operators
Fix -Wunused-private-field suppressing warnings when defaulted comparison
operators are declared as friend functions. The warning should only be
suppressed for comparison operators that are class members.
Fixes #116270
---
clang/lib/Sema/SemaDeclCXX.cpp | 2 +-
clang/test/SemaCXX/warn-unused-private-field.cpp | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 26041e53de5061..e115eb0a3d7e10 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -7535,7 +7535,7 @@ void Sema::CheckExplicitlyDefaultedFunction(Scope *S,
FunctionDecl *FD) {
return;
}
- if (DefKind.isComparison())
+ if (DefKind.isComparison() && isa<CXXRecordDecl>(FD->getDeclContext()))
UnusedPrivateFields.clear();
if (DefKind.isSpecialMember()
diff --git a/clang/test/SemaCXX/warn-unused-private-field.cpp
b/clang/test/SemaCXX/warn-unused-private-field.cpp
index 1128eacc309d9f..bdd66807dca35f 100644
--- a/clang/test/SemaCXX/warn-unused-private-field.cpp
+++ b/clang/test/SemaCXX/warn-unused-private-field.cpp
@@ -20,6 +20,17 @@ class SpaceShipDefaultCompare {
int operator<=>(const SpaceShipDefaultCompare &) const = default;
};
+class UnusedConstPrivateField {
+ public:
+ UnusedConstPrivateField() : unused_(0) {}
+ private:
+ const int unused_; // expected-warning{{private field 'unused_' is not used}}
+};
+
+class FriendEqDefaultCompare {
+ friend auto operator==(FriendEqDefaultCompare, FriendEqDefaultCompare) ->
bool = default;
+};
+
#endif
class NotFullyDefined {
>From c41cb5e89effd4f4a92131052ed6bb036a4159dc Mon Sep 17 00:00:00 2001
From: Chris White <chriswhiteio...@gmail.com>
Date: Wed, 20 Nov 2024 18:34:52 +0000
Subject: [PATCH 2/2] Address review comments
---
clang/lib/Sema/SemaDeclCXX.cpp | 11 +++++++++--
clang/test/SemaCXX/warn-unused-private-field.cpp | 13 ++++++++-----
2 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index e115eb0a3d7e10..ccc2d5304058a3 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -7535,8 +7535,15 @@ void Sema::CheckExplicitlyDefaultedFunction(Scope *S,
FunctionDecl *FD) {
return;
}
- if (DefKind.isComparison() && isa<CXXRecordDecl>(FD->getDeclContext()))
- UnusedPrivateFields.clear();
+ if (DefKind.isComparison()) {
+ auto PT = FD->getParamDecl(0)->getType();
+ if (const CXXRecordDecl *RD =
+ PT.getNonReferenceType()->getAsCXXRecordDecl()) {
+ for (FieldDecl *Field : RD->fields()) {
+ UnusedPrivateFields.remove(Field);
+ }
+ }
+ }
if (DefKind.isSpecialMember()
? CheckExplicitlyDefaultedSpecialMember(cast<CXXMethodDecl>(FD),
diff --git a/clang/test/SemaCXX/warn-unused-private-field.cpp
b/clang/test/SemaCXX/warn-unused-private-field.cpp
index bdd66807dca35f..717b1864272140 100644
--- a/clang/test/SemaCXX/warn-unused-private-field.cpp
+++ b/clang/test/SemaCXX/warn-unused-private-field.cpp
@@ -20,17 +20,20 @@ class SpaceShipDefaultCompare {
int operator<=>(const SpaceShipDefaultCompare &) const = default;
};
-class UnusedConstPrivateField {
- public:
- UnusedConstPrivateField() : unused_(0) {}
- private:
- const int unused_; // expected-warning{{private field 'unused_' is not used}}
+class HasUnusedField {
+ int unused_; // expected-warning{{private field 'unused_' is not used}}
};
class FriendEqDefaultCompare {
+ int used;
friend auto operator==(FriendEqDefaultCompare, FriendEqDefaultCompare) ->
bool = default;
};
+class UnrelatedFriendEqDefaultCompare {
+ friend auto operator==(UnrelatedFriendEqDefaultCompare,
UnrelatedFriendEqDefaultCompare) -> bool = default;
+ int operator<=>(const UnrelatedFriendEqDefaultCompare &) const = default;
+};
+
#endif
class NotFullyDefined {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
