This revision was automatically updated to reflect the committed changes. Closed by commit rGce2d44b0ab6d: [clang-tidy] Accessing checks not done for aliases of `std::array` (authored by sousajo, committed by PiotrZSL).
Changed prior to commit: https://reviews.llvm.org/D154297?vs=536622&id=536805#toc Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D154297/new/ https://reviews.llvm.org/D154297 Files: clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp clang-tools-extra/docs/ReleaseNotes.rst clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index.cpp Index: clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index.cpp =================================================================== --- clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index.cpp +++ clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index.cpp @@ -44,6 +44,28 @@ a[1] = 3; // OK, constant index and inside bounds a[9] = 3; // OK, constant index and inside bounds a[const_index(6)] = 3; // OK, constant index and inside bounds + + using MyArray = std::array<int, 10>; + MyArray m{}; + m [ pos / 2 /*comment*/] = 1; + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: do not use array subscript when the index is not an integer constant expression [cppcoreguidelines-pro-bounds-constant-array-index] + int jj = m[pos - 1]; + // CHECK-MESSAGES: :[[@LINE-1]]:12: warning: do not use array subscript when the index is not an integer constant expression + + m.at(pos-1) = 2; // OK, at() instead of [] + gsl::at(m, pos-1) = 2; // OK, gsl::at() instead of [] + m[-1] = 3; + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: std::array<> index -1 is negative [cppcoreguidelines-pro-bounds-constant-array-index] + m[10] = 4; + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: std::array<> index 10 is past the end of the array (which contains 10 elements) [cppcoreguidelines-pro-bounds-constant-array-index] + + m[const_index(7)] = 3; + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: std::array<> index 10 is past the end of the array (which contains 10 elements) + + m[0] = 3; // OK, constant index and inside bounds + m[1] = 3; // OK, constant index and inside bounds + m[9] = 3; // OK, constant index and inside bounds + m[const_index(6)] = 3; // OK, constant index and inside bounds } void g() { Index: clang-tools-extra/docs/ReleaseNotes.rst =================================================================== --- clang-tools-extra/docs/ReleaseNotes.rst +++ clang-tools-extra/docs/ReleaseNotes.rst @@ -321,6 +321,10 @@ :doc:`cppcoreguidelines-use-default-member-init <clang-tidy/checks/cppcoreguidelines/use-default-member-init>` instead. +- Improved :doc:`cppcoreguidelines-pro-bounds-constant-array-index + <clang-tidy/checks/cppcoreguidelines/pro-bounds-constant-array-index>` check + to cover type aliases of ``std::array``. + - Fixed a false positive in :doc:`cppcoreguidelines-slicing <clang-tidy/checks/cppcoreguidelines/slicing>` check when warning would be emitted in constructor for virtual base class initialization. Index: clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp =================================================================== --- clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp +++ clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp @@ -49,7 +49,8 @@ cxxOperatorCallExpr( hasOverloadedOperatorName("[]"), hasArgument( - 0, hasType(cxxRecordDecl(hasName("::std::array")).bind("type"))), + 0, hasType(hasUnqualifiedDesugaredType(recordType(hasDeclaration( + cxxRecordDecl(hasName("::std::array")).bind("type")))))), hasArgument(1, expr().bind("index"))) .bind("expr"), this);
Index: clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index.cpp =================================================================== --- clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index.cpp +++ clang-tools-extra/test/clang-tidy/checkers/cppcoreguidelines/pro-bounds-constant-array-index.cpp @@ -44,6 +44,28 @@ a[1] = 3; // OK, constant index and inside bounds a[9] = 3; // OK, constant index and inside bounds a[const_index(6)] = 3; // OK, constant index and inside bounds + + using MyArray = std::array<int, 10>; + MyArray m{}; + m [ pos / 2 /*comment*/] = 1; + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: do not use array subscript when the index is not an integer constant expression [cppcoreguidelines-pro-bounds-constant-array-index] + int jj = m[pos - 1]; + // CHECK-MESSAGES: :[[@LINE-1]]:12: warning: do not use array subscript when the index is not an integer constant expression + + m.at(pos-1) = 2; // OK, at() instead of [] + gsl::at(m, pos-1) = 2; // OK, gsl::at() instead of [] + m[-1] = 3; + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: std::array<> index -1 is negative [cppcoreguidelines-pro-bounds-constant-array-index] + m[10] = 4; + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: std::array<> index 10 is past the end of the array (which contains 10 elements) [cppcoreguidelines-pro-bounds-constant-array-index] + + m[const_index(7)] = 3; + // CHECK-MESSAGES: :[[@LINE-1]]:3: warning: std::array<> index 10 is past the end of the array (which contains 10 elements) + + m[0] = 3; // OK, constant index and inside bounds + m[1] = 3; // OK, constant index and inside bounds + m[9] = 3; // OK, constant index and inside bounds + m[const_index(6)] = 3; // OK, constant index and inside bounds } void g() { Index: clang-tools-extra/docs/ReleaseNotes.rst =================================================================== --- clang-tools-extra/docs/ReleaseNotes.rst +++ clang-tools-extra/docs/ReleaseNotes.rst @@ -321,6 +321,10 @@ :doc:`cppcoreguidelines-use-default-member-init <clang-tidy/checks/cppcoreguidelines/use-default-member-init>` instead. +- Improved :doc:`cppcoreguidelines-pro-bounds-constant-array-index + <clang-tidy/checks/cppcoreguidelines/pro-bounds-constant-array-index>` check + to cover type aliases of ``std::array``. + - Fixed a false positive in :doc:`cppcoreguidelines-slicing <clang-tidy/checks/cppcoreguidelines/slicing>` check when warning would be emitted in constructor for virtual base class initialization. Index: clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp =================================================================== --- clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp +++ clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp @@ -49,7 +49,8 @@ cxxOperatorCallExpr( hasOverloadedOperatorName("[]"), hasArgument( - 0, hasType(cxxRecordDecl(hasName("::std::array")).bind("type"))), + 0, hasType(hasUnqualifiedDesugaredType(recordType(hasDeclaration( + cxxRecordDecl(hasName("::std::array")).bind("type")))))), hasArgument(1, expr().bind("index"))) .bind("expr"), this);
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits