AMS21 updated this revision to Diff 510537. AMS21 marked 2 inline comments as done. AMS21 added a comment.
Implement suggested way of checking for anonymous structs Add a new more tests Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D147411/new/ https://reviews.llvm.org/D147411 Files: clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp clang-tools-extra/docs/ReleaseNotes.rst clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance.cpp
Index: clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance.cpp =================================================================== --- clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance.cpp +++ clang-tools-extra/test/clang-tidy/checkers/readability/static-accessed-through-instance.cpp @@ -285,3 +285,60 @@ // CHECK-MESSAGES-NOT: :[[@LINE-1]]:10: warning: static member } // namespace Bugzilla_48758 + +// https://github.com/llvm/llvm-project/issues/61736 +namespace llvm_issue_61736 +{ + +struct { + static void f() {} +} AnonStruct, *AnonStructPointer; + +class { + public: + static void f() {} +} AnonClass, *AnonClassPointer; + +void testAnonymousStructAndClass() { + AnonStruct.f(); + AnonStructPointer->f(); + + AnonClass.f(); + AnonClassPointer->f(); +} + +struct Embedded { + struct { + static void f() {} + } static EmbeddedStruct, *EmbeddedStructPointer; + + class { + public: + static void f() {} + } static EmbeddedClass, *EmbeddedClassPointer; +}; + +void testEmbeddedAnonymousStructAndClass() { + Embedded::EmbeddedStruct.f(); + Embedded::EmbeddedStructPointer->f(); + + Embedded::EmbeddedClass.f(); + Embedded::EmbeddedClassPointer->f(); + + Embedded E; + E.EmbeddedStruct.f(); + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: static member accessed through instance [readability-static-accessed-through-instance] + // CHECK-FIXES: {{^}} llvm_issue_61736::Embedded::EmbeddedStruct.f();{{$}} + E.EmbeddedStructPointer->f(); + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: static member accessed through instance [readability-static-accessed-through-instance] + // CHECK-FIXES: {{^}} llvm_issue_61736::Embedded::EmbeddedStructPointer->f();{{$}} + + E.EmbeddedClass.f(); + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: static member accessed through instance [readability-static-accessed-through-instance] + // CHECK-FIXES: {{^}} llvm_issue_61736::Embedded::EmbeddedClass.f();{{$}} + E.EmbeddedClassPointer->f(); + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: static member accessed through instance [readability-static-accessed-through-instance] + // CHECK-FIXES: {{^}} llvm_issue_61736::Embedded::EmbeddedClassPointer->f();{{$}} +} + +} // namespace llvm_issue_61736 Index: clang-tools-extra/docs/ReleaseNotes.rst =================================================================== --- clang-tools-extra/docs/ReleaseNotes.rst +++ clang-tools-extra/docs/ReleaseNotes.rst @@ -267,6 +267,10 @@ string for ``Prefix`` or ``Suffix`` options could result in the style not being used. +- Fixed an issue in :doc:`readability-static-accessed-through-instance + <clang-tidy/checks/readability/static-accessed-through-instance>` when using + anonymous structs or classes. + - Fixed an issue in :doc:`google-readability-avoid-underscore-in-googletest-name <clang-tidy/checks/google/readability-avoid-underscore-in-googletest-name>` when using ``DISABLED_`` in the test suite name. Index: clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp =================================================================== --- clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp +++ clang-tools-extra/clang-tidy/readability/StaticAccessedThroughInstanceCheck.cpp @@ -58,7 +58,7 @@ if (isa<CXXOperatorCallExpr>(BaseExpr)) return; - QualType BaseType = + const QualType BaseType = BaseExpr->getType()->isPointerType() ? BaseExpr->getType()->getPointeeType().getUnqualifiedType() : BaseExpr->getType().getUnqualifiedType(); @@ -74,6 +74,11 @@ std::string BaseTypeName = BaseType.getAsString(PrintingPolicyWithSupressedTag); + // Ignore anonymous structs/classes which will not have an identifier + const RecordDecl *RecDecl = BaseType->getAsCXXRecordDecl(); + if (!RecDecl || RecDecl->getIdentifier() == nullptr) + return; + // Do not warn for CUDA built-in variables. if (StringRef(BaseTypeName).startswith("__cuda_builtin_")) return;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
