[clang-tidy] Fix false positives with deducing this in readability-convert-member-functions-to-static check
#141391
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
flovent
changed the title
readability-convert-member-functions-to-static checkreadability-convert-member-functions-to-static check
|
@llvm/pr-subscribers-clang-tools-extra Author: None (flovent) ChangesFixes #141381. Add check for Full diff: https://github.com/llvm/llvm-project/pull/141391.diff 3 Files Affected:
diff --git a/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStatic.cpp b/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStatic.cpp
index 1284df6bd99cf..5cdd00414e01e 100644
--- a/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStatic.cpp
+++ b/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStatic.cpp
@@ -62,6 +62,16 @@ AST_MATCHER(CXXMethodDecl, usesThis) {
return false; // Stop traversal.
}
+ bool VisitDeclRefExpr(const DeclRefExpr *E) {
+ if (const auto *PVD = dyn_cast_if_present<ParmVarDecl>(E->getDecl());
+ PVD && PVD->isExplicitObjectParameter()) {
+ Used = true;
+ return false; // Stop traversal.
+ }
+
+ return true;
+ }
+
// If we enter a class declaration, don't traverse into it as any usages of
// `this` will correspond to the nested class.
bool TraverseCXXRecordDecl(CXXRecordDecl *RD) { return true; }
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst
index 8611b5e0af272..a138272cc8e39 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -234,6 +234,10 @@ Changes in existing checks
tolerating fix-it breaking compilation when functions is used as pointers
to avoid matching usage of functions within the current compilation unit.
+- Improved :doc:`readability-convert-member-functions-to-static
+ <clang-tidy/checks/readability/convert-member-functions-to-static>` check by
+ fixing false positives on member functions with an explicit object parameter.
+
Removed checks
^^^^^^^^^^^^^^
diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/convert-member-functions-to-static-deducing-this.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/convert-member-functions-to-static-deducing-this.cpp
new file mode 100644
index 0000000000000..bb9755abc9cfa
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/convert-member-functions-to-static-deducing-this.cpp
@@ -0,0 +1,14 @@
+// RUN: %check_clang_tidy -std=c++23 %s readability-convert-member-functions-to-static %t
+
+namespace std{
+ class string {};
+ void println(const char *format, const std::string &str) {}
+}
+
+namespace PR141381 {
+struct Hello {
+ std::string str_;
+
+ void hello(this Hello &self) { std::println("Hello, {0}!", self.str_); }
+};
+}
|
|
@llvm/pr-subscribers-clang-tidy Author: None (flovent) ChangesFixes #141381. Add check for Full diff: https://github.com/llvm/llvm-project/pull/141391.diff 3 Files Affected:
diff --git a/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStatic.cpp b/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStatic.cpp
index 1284df6bd99cf..5cdd00414e01e 100644
--- a/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStatic.cpp
+++ b/clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStatic.cpp
@@ -62,6 +62,16 @@ AST_MATCHER(CXXMethodDecl, usesThis) {
return false; // Stop traversal.
}
+ bool VisitDeclRefExpr(const DeclRefExpr *E) {
+ if (const auto *PVD = dyn_cast_if_present<ParmVarDecl>(E->getDecl());
+ PVD && PVD->isExplicitObjectParameter()) {
+ Used = true;
+ return false; // Stop traversal.
+ }
+
+ return true;
+ }
+
// If we enter a class declaration, don't traverse into it as any usages of
// `this` will correspond to the nested class.
bool TraverseCXXRecordDecl(CXXRecordDecl *RD) { return true; }
diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst
index 8611b5e0af272..a138272cc8e39 100644
--- a/clang-tools-extra/docs/ReleaseNotes.rst
+++ b/clang-tools-extra/docs/ReleaseNotes.rst
@@ -234,6 +234,10 @@ Changes in existing checks
tolerating fix-it breaking compilation when functions is used as pointers
to avoid matching usage of functions within the current compilation unit.
+- Improved :doc:`readability-convert-member-functions-to-static
+ <clang-tidy/checks/readability/convert-member-functions-to-static>` check by
+ fixing false positives on member functions with an explicit object parameter.
+
Removed checks
^^^^^^^^^^^^^^
diff --git a/clang-tools-extra/test/clang-tidy/checkers/readability/convert-member-functions-to-static-deducing-this.cpp b/clang-tools-extra/test/clang-tidy/checkers/readability/convert-member-functions-to-static-deducing-this.cpp
new file mode 100644
index 0000000000000..bb9755abc9cfa
--- /dev/null
+++ b/clang-tools-extra/test/clang-tidy/checkers/readability/convert-member-functions-to-static-deducing-this.cpp
@@ -0,0 +1,14 @@
+// RUN: %check_clang_tidy -std=c++23 %s readability-convert-member-functions-to-static %t
+
+namespace std{
+ class string {};
+ void println(const char *format, const std::string &str) {}
+}
+
+namespace PR141381 {
+struct Hello {
+ std::string str_;
+
+ void hello(this Hello &self) { std::println("Hello, {0}!", self.str_); }
+};
+}
|
vbvictor
requested changes
May 25, 2025
clang-tools-extra/clang-tidy/readability/ConvertMemberFunctionsToStatic.cpp
Outdated
Show resolved
Hide resolved
...ra/test/clang-tidy/checkers/readability/convert-member-functions-to-static-deducing-this.cpp
Outdated
Show resolved
Hide resolved
...ra/test/clang-tidy/checkers/readability/convert-member-functions-to-static-deducing-this.cpp
Outdated
Show resolved
Hide resolved
vbvictor
approved these changes
May 25, 2025
| hasTrivialBody(), isOverloadedOperator(), cxxConstructorDecl(), | ||
| cxxDestructorDecl(), cxxConversionDecl(), isTemplate(), | ||
| isDependentContext(), | ||
| isExplicitObjectMemberFunction(), isExpansionInSystemHeader(), |
There was a problem hiding this comment.
Please place isExplicitObjectMemberFunction() after cxxConversionDecl(). These predicates are checked from first to last in order, so for efficiency I'd put it after cxxConversionDecl().
| @@ -0,0 +1,22 @@ | |||
| // RUN: %check_clang_tidy -std=c++23 %s readability-convert-member-functions-to-static %t | |||
There was a problem hiding this comment.
Suggested change
| // RUN: %check_clang_tidy -std=c++23 %s readability-convert-member-functions-to-static %t | |
| // RUN: %check_clang_tidy -std=c++23-or-later %s readability-convert-member-functions-to-static %t |
flovent
force-pushed
the
clang-tidy-issue-141381
branch
from
f86e0c0 to
4d7edc0
Compare
flovent
force-pushed
the
clang-tidy-issue-141381
branch
from
4d7edc0 to
c9f00ba
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #141381.
Add check for
DeclRefExprwhich points to an explicit object parameter.