Add helper function

danmar · Apr 5, 2024 · d342842 · d342842
1 parent b2bc09d
commit d342842
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -241,9 +241,14 @@ bool astIsIterator(const Token *tok)
     return tok && tok->valueType() && tok->valueType()->type == ValueType::Type::ITERATOR;
 }
 
-const Library::Container* astIsContainer(const Token* tok) {
+bool astIsContainer(const Token* tok) {
+    return getLibraryContainer(tok) != nullptr && !astIsIterator(tok);
+}
+
+bool astIsUniversalContainer(const Token* tok)
+{
     const Library::Container* container = getLibraryContainer(tok);
-    return container != nullptr && !astIsIterator(tok) ? container : nullptr;
+    return container && !container->stdStringLike && !astIsIterator(tok);
 }
 
 bool astIsContainerView(const Token* tok)

diff --git a/lib/astutils.h b/lib/astutils.h
@@ -163,7 +163,8 @@ bool astIsUniqueSmartPointer(const Token* tok);
 
 bool astIsIterator(const Token *tok);
 
-const Library::Container* astIsContainer(const Token *tok);
+bool astIsContainer(const Token *tok);
+bool astIsUniversalContainer(const Token *tok);
 
 bool astIsContainerView(const Token* tok);
 bool astIsContainerOwned(const Token* tok);

diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -4455,7 +4455,6 @@ static void valueFlowLifetimeFunction(Token *tok, TokenList &tokenlist, ErrorLog
     if (Token::Match(tok->astParent(), ". %name% (") && astIsRHS(tok))
         memtok = tok->astParent()->astOperand1();
     const int returnContainer = settings.library.returnValueContainer(tok);
-    const Library::Container* container{};
     if (returnContainer >= 0) {
         std::vector<const Token *> args = getArguments(tok);
         for (int argnr = 1; argnr <= args.size(); ++argnr) {
@@ -4490,7 +4489,7 @@ static void valueFlowLifetimeFunction(Token *tok, TokenList &tokenlist, ErrorLog
                 tok->next(), tokenlist, errorLogger, settings);
         }
     } else if (memtok && Token::Match(tok->astParent(), ". push_back|push_front|insert|push|assign") &&
-               (container = astIsContainer(memtok)) && !container->stdStringLike) {
+               astIsUniversalContainer(memtok)) {
         std::vector<const Token *> args = getArguments(tok);
         const std::size_t n = args.size();
         if (n > 1 && Token::typeStr(args[n - 2]) == Token::typeStr(args[n - 1]) &&