Author: Haojian Wu Date: 2022-12-19T19:46:18+01:00 New Revision: 8a7ea764b2583e93fe0a332739c391d3bb11a867
URL: https://github.com/llvm/llvm-project/commit/8a7ea764b2583e93fe0a332739c391d3bb11a867 DIFF: https://github.com/llvm/llvm-project/commit/8a7ea764b2583e93fe0a332739c391d3bb11a867.diff LOG: [include-cleaner] Base-type usage from member exprs is implicit. Per the discussion on https://reviews.llvm.org/D140095#inline-1352956 Differential Revision: https://reviews.llvm.org/D140284 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 cf2373d43389d..f32221018cafa 100644 --- a/clang-tools-extra/include-cleaner/lib/WalkAST.cpp +++ b/clang-tools-extra/include-cleaner/lib/WalkAST.cpp @@ -80,12 +80,12 @@ class ASTWalker : public RecursiveASTVisitor<ASTWalker> { // // FIXME: support dependent types, e.g., "std::vector<T>().size()". QualType Type = E->getBase()->IgnoreImpCasts()->getType(); - // FIXME: this should report as implicit reference. - report(E->getMemberLoc(), getMemberProvider(Type)); + report(E->getMemberLoc(), getMemberProvider(Type), RefType::Implicit); return true; } bool VisitCXXDependentScopeMemberExpr(CXXDependentScopeMemberExpr *E) { - report(E->getMemberLoc(), getMemberProvider(E->getBaseType())); + report(E->getMemberLoc(), getMemberProvider(E->getBaseType()), + RefType::Implicit); return true; } diff --git a/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp b/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp index 2a2fbc438ab9b..ca2eb25eceeeb 100644 --- a/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp +++ b/clang-tools-extra/include-cleaner/unittests/WalkASTTest.cpp @@ -180,32 +180,32 @@ TEST(WalkAST, TemplateNames) { } TEST(WalkAST, MemberExprs) { - testWalk("struct $explicit^S { void foo(); };", "void foo() { S{}.^foo(); }"); + testWalk("struct $implicit^S { void foo(); };", "void foo() { S{}.^foo(); }"); testWalk( - "struct S { void foo(); }; struct $explicit^X : S { using S::foo; };", + "struct S { void foo(); }; struct $implicit^X : S { using S::foo; };", "void foo() { X{}.^foo(); }"); - testWalk("struct Base { int a; }; struct $explicit^Derived : public Base {};", + testWalk("struct Base { int a; }; struct $implicit^Derived : public Base {};", "void fun(Derived d) { d.^a; }"); - testWalk("struct Base { int a; }; struct $explicit^Derived : public Base {};", + testWalk("struct Base { int a; }; struct $implicit^Derived : public Base {};", "void fun(Derived* d) { d->^a; }"); - testWalk("struct Base { int a; }; struct $explicit^Derived : public Base {};", + testWalk("struct Base { int a; }; struct $implicit^Derived : public Base {};", "void fun(Derived& d) { d.^a; }"); - testWalk("struct Base { int a; }; struct $explicit^Derived : public Base {};", + testWalk("struct Base { int a; }; struct $implicit^Derived : public Base {};", "void fun() { Derived().^a; }"); - testWalk("struct Base { int a; }; struct $explicit^Derived : public Base {};", + testWalk("struct Base { int a; }; struct $implicit^Derived : public Base {};", "Derived foo(); void fun() { foo().^a; }"); - testWalk("struct Base { int a; }; struct $explicit^Derived : public Base {};", + testWalk("struct Base { int a; }; struct $implicit^Derived : public Base {};", "Derived& foo(); void fun() { foo().^a; }"); testWalk(R"cpp( template <typename T> struct unique_ptr { T *operator->(); }; - struct $explicit^Foo { int a; };)cpp", + struct $implicit^Foo { int a; };)cpp", "void test(unique_ptr<Foo> &V) { V->^a; }"); testWalk(R"cpp( template <typename T> - struct $explicit^unique_ptr { + struct $implicit^unique_ptr { void release(); }; struct Foo {};)cpp", @@ -213,28 +213,28 @@ TEST(WalkAST, MemberExprs) { // Respect the sugar type (typedef, using-type). testWalk(R"cpp( namespace ns { struct Foo { int a; }; } - using $explicit^Bar = ns::Foo;)cpp", + using $implicit^Bar = ns::Foo;)cpp", "void test(Bar b) { b.^a; }"); testWalk(R"cpp( namespace ns { struct Foo { int a; }; } - using ns::$explicit^Foo;)cpp", + using ns::$implicit^Foo;)cpp", "void test(Foo b) { b.^a; }"); testWalk(R"cpp( namespace ns { struct Foo { int a; }; } namespace ns2 { using Bar = ns::Foo; } - using ns2::$explicit^Bar; + using ns2::$implicit^Bar; )cpp", "void test(Bar b) { b.^a; }"); testWalk(R"cpp( namespace ns { template<typename> struct Foo { int a; }; } - using ns::$explicit^Foo;)cpp", + using ns::$implicit^Foo;)cpp", "void k(Foo<int> b) { b.^a; }"); // Test the dependent-type case (CXXDependentScopeMemberExpr) - testWalk("template<typename T> struct $explicit^Base { void method(); };", + testWalk("template<typename T> struct $implicit^Base { void method(); };", "template<typename T> void k(Base<T> t) { t.^method(); }"); - testWalk("template<typename T> struct $explicit^Base { void method(); };", + testWalk("template<typename T> struct $implicit^Base { void method(); };", "template<typename T> void k(Base<T>& t) { t.^method(); }"); - testWalk("template<typename T> struct $explicit^Base { void method(); };", + testWalk("template<typename T> struct $implicit^Base { void method(); };", "template<typename T> void k(Base<T>* t) { t->^method(); }"); } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
