diff options
| -rw-r--r-- | clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp | 5 | ||||
| -rw-r--r-- | clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index.cpp | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp index a57ec49a199..56fbf742f63 100644 --- a/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp +++ b/clang-tools-extra/clang-tidy/cppcoreguidelines/ProBoundsConstantArrayIndexCheck.cpp @@ -45,9 +45,12 @@ void ProBoundsConstantArrayIndexCheck::registerMatchers(MatchFinder *Finder) { if (!getLangOpts().CPlusPlus) return; + // Note: if a struct contains an array member, the compiler-generated + // constructor has an arraySubscriptExpr. Finder->addMatcher(arraySubscriptExpr(hasBase(ignoringImpCasts(hasType( constantArrayType().bind("type")))), - hasIndex(expr().bind("index"))) + hasIndex(expr().bind("index")), + unless(hasAncestor(isImplicit()))) .bind("expr"), this); diff --git a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index.cpp b/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index.cpp index 8f22302ce29..35194109934 100644 --- a/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index.cpp +++ b/clang-tools-extra/test/clang-tidy/cppcoreguidelines-pro-bounds-constant-array-index.cpp @@ -74,3 +74,14 @@ void customOperator() { int i = 0; s[i] = 3; // OK, custom operator } + +struct A { + // The compiler-generated copy constructor uses an ArraySubscriptExpr. Don't warn. + int x[3]; +}; + +void use_A() { + // Force the compiler to generate a copy constructor. + A a; + A a2(a); +} |
