Author: Kadir Cetinkaya Date: 2023-04-18T10:01:31+02:00 New Revision: cc5fb7a79b58d7e6509b74e1935850e3307bbdc7
URL: https://github.com/llvm/llvm-project/commit/cc5fb7a79b58d7e6509b74e1935850e3307bbdc7 DIFF: https://github.com/llvm/llvm-project/commit/cc5fb7a79b58d7e6509b74e1935850e3307bbdc7.diff LOG: [include-cleaner] Unify behaviour for static & instance members Fixes https://github.com/llvm/llvm-project/issues/62185 Differential Revision: https://reviews.llvm.org/D148552 Added: Modified: clang-tools-extra/include-cleaner/lib/WalkAST.cpp clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/include-cleaner/lib/WalkAST.cpp b/clang-tools-extra/include-cleaner/lib/WalkAST.cpp index e977bcbb402f7..4ea7bceeb96ed 100644 --- a/clang-tools-extra/include-cleaner/lib/WalkAST.cpp +++ b/clang-tools-extra/include-cleaner/lib/WalkAST.cpp @@ -125,7 +125,13 @@ class ASTWalker : public RecursiveASTVisitor<ASTWalker> { } bool VisitDeclRefExpr(DeclRefExpr *DRE) { - report(DRE->getLocation(), DRE->getFoundDecl()); + // Static class members are handled here, as they don't produce MemberExprs. + if (DRE->getFoundDecl()->isCXXClassMember()) { + if (auto *Qual = DRE->getQualifier()) + report(DRE->getLocation(), Qual->getAsRecordDecl(), RefType::Implicit); + } else { + report(DRE->getLocation(), DRE->getFoundDecl()); + } return true; } diff --git a/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp b/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp index 2060ffe3bb56c..ffe8bbffc3712 100644 --- a/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp +++ b/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp @@ -114,7 +114,7 @@ TEST(WalkAST, DeclRef) { testWalk("int $explicit^x;", "int y = ^x;"); testWalk("int $explicit^foo();", "int y = ^foo();"); testWalk("namespace ns { int $explicit^x; }", "int y = ns::^x;"); - testWalk("struct S { static int $explicit^x; };", "int y = S::^x;"); + testWalk("struct $implicit^S { static int x; };", "int y = S::^x;"); // Canonical declaration only. testWalk("extern int $explicit^x; int x;", "int y = ^x;"); // Return type of `foo` isn't used. @@ -342,6 +342,13 @@ TEST(WalkAST, TemplateNames) { } TEST(WalkAST, MemberExprs) { + testWalk("struct $implicit^S { static int f; };", "void foo() { S::^f; }"); + testWalk("struct B { static int f; }; struct $implicit^S : B {};", + "void foo() { S::^f; }"); + testWalk("struct B { static void f(); }; struct $implicit^S : B {};", + "void foo() { S::^f; }"); + testWalk("struct B { static void f(); }; ", + "struct S : B { void foo() { ^f(); } };"); testWalk("struct $implicit^S { void foo(); };", "void foo() { S{}.^foo(); }"); testWalk( "struct S { void foo(); }; struct $implicit^X : S { using S::foo; };", _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
