Fix initList handling

Author: PiotrZSL

clang-tools-extra/clang-tidy/bugprone/SuspiciousStringviewDataUsageCheck.cpp

@@ -62,28 +62,29 @@ void SuspiciousStringviewDataUsageCheck::registerMatchers(MatchFinder *Finder) {
       on(ignoringParenImpCasts(
           matchers::isStatementIdenticalToBoundNode("self"))));
 
+  auto DescendantSizeCall = expr(hasDescendant(expr(SizeCall,
+                                               hasAncestor(expr(AncestorCall).bind("ancestor-size")),
+                                               hasAncestor(expr(equalsBoundNode("parent"), equalsBoundNode("ancestor-size"))))));
+
   Finder->addMatcher(
       cxxMemberCallExpr(
           on(ignoringParenImpCasts(expr().bind("self"))), callee(DataMethod),
           expr().bind("data-call"),
           hasParent(expr(anyOf(
               invocation(
-                  expr().bind("call"), unless(cxxOperatorCallExpr()),
+                  expr().bind("parent"), unless(cxxOperatorCallExpr()),
                   hasAnyArgument(
                       ignoringParenImpCasts(equalsBoundNode("data-call"))),
                   unless(hasAnyArgument(ignoringParenImpCasts(SizeCall))),
-                  unless(hasAnyArgument(hasDescendant(expr(
-                      SizeCall,
-                      hasAncestor(expr(AncestorCall).bind("ancestor-size")),
-                      hasAncestor(expr(equalsBoundNode("call"),
-                                       equalsBoundNode("ancestor-size"))))))),
+                  unless(hasAnyArgument(DescendantSizeCall)),
                   hasDeclaration(namedDecl(
                       unless(matchers::matchesAnyListedName(AllowedCallees))))),
-              initListExpr(expr().bind("init"),
+              initListExpr(expr().bind("parent"),
                            hasType(qualType(hasCanonicalType(hasDeclaration(
                                recordDecl(unless(matchers::matchesAnyListedName(
                                    AllowedCallees))))))),
-                           unless(has(ignoringParenImpCasts(SizeCall)))))))),
+                           unless(DescendantSizeCall))
+                )))),
       this);
 }
 

clang-tools-extra/test/clang-tidy/checkers/bugprone/suspicious-stringview-data-usage.cpp

@@ -5,6 +5,11 @@ struct View {
    const char* str;
 };
 
+struct Pair {
+   const char* begin;
+   const char* end;
+};
+
 struct ViewWithSize {
    const char* str;
    std::string_view::size_type size;
@@ -43,6 +48,9 @@ void valid(std::string_view sv) {
   something(sv.data(), sv.length());
   ViewWithSize view1{sv.data(), sv.size()};
   ViewWithSize view2{sv.data(), sv.length()};
-
+  Pair view3{sv.data(), sv.data() + sv.size()};
+  Pair view4{sv.data(), sv.data() + sv.length()};
+  Pair view5{sv.data(), sv.size() + sv.data()};
+  Pair view6{sv.data(), sv.length() + sv.data()};
   const char* str{sv.data()};
 }