Fix

Author: web-flow

lib/checkautovariables.cpp

@@ -612,8 +612,6 @@ void CheckAutoVariables::checkVarLifetimeScope(const Token * start, const Token
                         if (tokvalue->exprId() == tok->exprId() && !(tok->variable() && tok->variable()->isArray()) &&
                             !astIsContainerView(tok->astParent()))
                             continue;
-                        if (tokvalue->str() == "=" && isDesignatedInitializer(tokvalue->astOperand1()))
-                            tokvalue = tokvalue->astOperand2();
                         if ((tokvalue->variable() && !isEscapedReference(tokvalue->variable()) &&
                              isInScope(tokvalue->variable()->nameToken(), scope)) ||
                             isDeadTemporary(tokvalue, nullptr, mSettings->library)) {

lib/valueflow.cpp

@@ -2861,30 +2861,39 @@ static void valueFlowLifetimeClassConstructor(Token* tok,
         std::vector<const Token*> args = getArguments(tok);
         if (scope->numConstructors == 0) {
             auto it = scope->varlist.cbegin();
+            const bool hasDesignatedInitializers = !args.empty() && isDesignatedInitializer(args[0]->astOperand1());
             LifetimeStore::forEach(
                 tokenlist,
                 errorLogger,
                 settings,
                 args,
                 "Passed to constructor of '" + t->name() + "'.",
                 ValueFlow::Value::LifetimeKind::SubObject,
-                [&](LifetimeStore& ls) {
-                // Skip static variable
-                it = std::find_if(it, scope->varlist.cend(), [](const Variable& var) {
-                    return !var.isStatic();
+                [&](LifetimeStore &ls)
+                {
+                    // Skip static variable
+                    it = std::find_if(it, scope->varlist.cend(), [&](const Variable &var)
+                                      { return !var.isStatic() && (!hasDesignatedInitializers || var.name() == ls.argtok->astOperand1()->astOperand1()->str()); });
+                    if (it == scope->varlist.cend())
+                        return;
+                    if (hasDesignatedInitializers)
+                        ls.argtok = ls.argtok->astOperand2();
+                    const Variable &var = *it;
+                    if (var.valueType() && var.valueType()->container && var.valueType()->container->stdStringLike && !var.valueType()->container->view)
+                        return; // TODO: check in isLifetimeBorrowed()?
+                    if (var.isReference() || var.isRValueReference())
+                    {
+                        ls.byRef(tok, tokenlist, errorLogger, settings);
+                    }
+                    else if (ValueFlow::isLifetimeBorrowed(ls.argtok, settings))
+                    {
+                        ls.byVal(tok, tokenlist, errorLogger, settings);
+                    }
+                    if (hasDesignatedInitializers)
+                        it = scope->varlist.cbegin();
+                    else
+                        it++;
                 });
-                if (it == scope->varlist.cend())
-                    return;
-                const Variable& var = *it;
-                if (var.valueType() && var.valueType()->container && var.valueType()->container->stdStringLike && !var.valueType()->container->view)
-                    return; // TODO: check in isLifetimeBorrowed()?
-                if (var.isReference() || var.isRValueReference()) {
-                    ls.byRef(tok, tokenlist, errorLogger, settings);
-                } else if (ValueFlow::isLifetimeBorrowed(ls.argtok, settings)) {
-                    ls.byVal(tok, tokenlist, errorLogger, settings);
-                }
-                it++;
-            });
         } else {
             const Function* constructor = findConstructor(scope, tok, args);
             valueFlowLifetimeUserConstructor(tok, constructor, t->name(), args, tokenlist, errorLogger, settings);

test/testautovariables.cpp

@@ -3945,7 +3945,7 @@ class TestAutoVariables : public TestFixture {
               "    return a;\n"
               "}\n");
         ASSERT_EQUALS(
-            "[test.cpp:4:12] -> [test.cpp:5:12]: (error) Returning object that will be invalid when returning. [returnDanglingLifetime]\n",
+            "[test.cpp:4:14] -> [test.cpp:3:9] -> [test.cpp:5:12]: (error) Returning object that points to local variable 'x' that will be invalid when returning. [returnDanglingLifetime]\n",
             errout_str());
 
         check("struct A { int x; int& r};\n"