Author: Nathan James Date: 2022-04-08T14:17:41+01:00 New Revision: 0e0b0feff194358e5e68bf36f5a563d269fa8e88
URL: https://github.com/llvm/llvm-project/commit/0e0b0feff194358e5e68bf36f5a563d269fa8e88 DIFF: https://github.com/llvm/llvm-project/commit/0e0b0feff194358e5e68bf36f5a563d269fa8e88.diff LOG: [clang-tidy] Make performance-inefficient-vector-operation work on members Fixes https://llvm.org/PR50157 Adds support for when the container being read from in a range-for is a member of a struct. Reviewed By: aaron.ballman Differential Revision: https://reviews.llvm.org/D101624 Added: Modified: clang-tools-extra/clang-tidy/performance/InefficientVectorOperationCheck.cpp clang-tools-extra/docs/ReleaseNotes.rst clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clang-tidy/performance/InefficientVectorOperationCheck.cpp b/clang-tools-extra/clang-tidy/performance/InefficientVectorOperationCheck.cpp index a12d403d6ba09..e8c895e683c4e 100644 --- a/clang-tools-extra/clang-tidy/performance/InefficientVectorOperationCheck.cpp +++ b/clang-tools-extra/clang-tidy/performance/InefficientVectorOperationCheck.cpp @@ -68,6 +68,10 @@ ast_matchers::internal::Matcher<Expr> supportedContainerTypesMatcher() { "::std::unordered_map", "::std::array", "::std::deque"))); } +AST_MATCHER(Expr, hasSideEffects) { + return Node.HasSideEffects(Finder->getASTContext()); +} + } // namespace InefficientVectorOperationCheck::InefficientVectorOperationCheck( @@ -145,7 +149,10 @@ void InefficientVectorOperationCheck::addMatcher( // FIXME: Support more complex range-expressions. Finder->addMatcher( cxxForRangeStmt( - hasRangeInit(declRefExpr(supportedContainerTypesMatcher())), + hasRangeInit( + anyOf(declRefExpr(supportedContainerTypesMatcher()), + memberExpr(hasObjectExpression(unless(hasSideEffects())), + supportedContainerTypesMatcher()))), HasInterestingLoopBody, InInterestingCompoundStmt) .bind(RangeLoopName), this); diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst index 58ddb116f9840..11ed0e3ed2b66 100644 --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -127,6 +127,10 @@ New check aliases Changes in existing checks ^^^^^^^^^^^^^^^^^^^^^^^^^^ +- Improved :doc:`performance-inefficient-vector-operation + <clang-tidy/checks/performance-inefficient-vector-operation>` to work when + the vector is a member of a structure. + - Fixed a false positive in :doc:`readability-non-const-parameter <clang-tidy/checks/readability-non-const-parameter>` when the parameter is referenced by an lvalue diff --git a/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp b/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp index c603cf83df238..105d276562175 100644 --- a/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp +++ b/clang-tools-extra/test/clang-tidy/checkers/performance-inefficient-vector-operation.cpp @@ -44,7 +44,7 @@ class vector { void reserve(size_t n); void resize(size_t n); - size_t size(); + size_t size() const; const_reference operator[] (size_type) const; reference operator[] (size_type); @@ -359,3 +359,31 @@ void f(std::vector<int>& t) { } } } + +struct StructWithFieldContainer { + std::vector<int> Numbers; + std::vector<int> getNumbers() const { + std::vector<int> Result; + // CHECK-FIXES: Result.reserve(Numbers.size()); + for (auto Number : Numbers) { + Result.push_back(Number); + // CHECK-MESSAGES: :[[@LINE-1]]:7: warning: 'push_back' is called + } + return Result; + } +}; + +StructWithFieldContainer getStructWithField(); + +void foo(const StructWithFieldContainer &Src) { + std::vector<int> A; + // CHECK-FIXES: A.reserve(Src.Numbers.size()); + for (auto Number : Src.Numbers) { + A.push_back(Number); + // CHECK-MESSAGES: :[[@LINE-1]]:5: warning: 'push_back' is called + } + std::vector<int> B; + for (auto Number : getStructWithField().Numbers) { + B.push_back(Number); + } +} _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
