Fix #11374 FP danglingTemporaryLifetime with std::string_view (danmar#4602)

chrchr-github · web-flow · commit 4cb49013a74b · 2022-11-27T09:22:55.000+01:00
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -2178,8 +2178,6 @@ T* getTokenArgumentFunctionImpl(T* tok, int& argn)
         return nullptr;
     if (Token::simpleMatch(argtok, ","))
         argtok = argtok->astOperand1();
-    if (Token::simpleMatch(argtok, "(") && argtok->astOperand2())
-        argtok = argtok->astOperand2();
     tok = argtok;
     while (Token::Match(tok->astParent(), ",|(|{")) {
         tok = tok->astParent();
diff --git a/test/testastutils.cpp b/test/testastutils.cpp
@@ -326,6 +326,8 @@ class TestAstUtils : public TestFixture {
         ASSERT(Result::True == isUsedAsBool("void f(bool b); void f() { int i; f(i); }","i )"));
         ASSERT(Result::True == isUsedAsBool("void f() { int *i; if (*i) {} }", "i )"));
         ASSERT(Result::True == isUsedAsBool("void f() { int *i; if (*i) {} }", "* i )"));
+        ASSERT(Result::True == isUsedAsBool("int g(); void h(bool); void f() { h(g()); }", "( ) )"));
+        ASSERT(Result::True == isUsedAsBool("int g(int); void h(bool); void f() { h(g(0)); }", "( 0 ) )"));
     }
 };
 
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
@@ -2749,6 +2749,14 @@ class TestAutoVariables : public TestFixture {
               "    v.data();\n"
               "}\n");
         ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:2] -> [test.cpp:3]: (error) Using object that is a temporary.\n", errout.str());
+
+        check("std::string convert(std::string_view sv) { return std::string{ sv }; }\n" // #11374
+              "auto f() {\n"
+              "    std::vector<std::string> v;\n"
+              "    v.push_back(convert(\"foo\"));\n"
+              "    return v[0];\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void danglingLifetimeUniquePtr()

Original file line number	Diff line number	Diff line change
`@@ -326,6 +326,8 @@ class TestAstUtils : public TestFixture {`
`326`	`326`	`ASSERT(Result::True == isUsedAsBool("void f(bool b); void f() { int i; f(i); }","i )"));`
`327`	`327`	`ASSERT(Result::True == isUsedAsBool("void f() { int i; if (i) {} }", "i )"));`
`328`	`328`	`ASSERT(Result::True == isUsedAsBool("void f() { int i; if (i) {} }", "* i )"));`
	`329`	`+ ASSERT(Result::True == isUsedAsBool("int g(); void h(bool); void f() { h(g()); }", "( ) )"));`
	`330`	`+ ASSERT(Result::True == isUsedAsBool("int g(int); void h(bool); void f() { h(g(0)); }", "( 0 ) )"));`
`329`	`331`	`}`
`330`	`332`	`};`
`331`	`333`