Fix #13123 False unreadVariable for variable declared in if-condition… (danmar#7035)

… and with the same name with the target of a desigated initializer

Author: chrchr-github

lib/tokenize.cpp

@@ -4915,7 +4915,7 @@ void Tokenizer::setVarIdPass1()
             }
 
             if (tok->varId() == 0 && (!scopeStack.top().isEnum || !(Token::Match(tok->previous(), "{|,") && Token::Match(tok->next(), ",|=|}"))) &&
-                !Token::simpleMatch(tok->next(), ": ;")) {
+                !Token::simpleMatch(tok->next(), ": ;") && !(tok->tokAt(-1) && Token::Match(tok->tokAt(-2), "{|, ."))) {
                 const std::unordered_map<std::string, nonneg int>::const_iterator it = variableMap.map(globalNamespace).find(tok->str());
                 if (it != variableMap.map(globalNamespace).end()) {
                     tok->varId(it->second);

test/testvarid.cpp

@@ -3134,6 +3134,21 @@ class TestVarID : public TestFixture {
                                "void f(int a) {\n"
                                "    struct T t = { .a = 1 };\n"
                                "}\n"));
+
+        ASSERT_EQUALS("1: struct S { int x@1 ; } ;\n" // TODO: set some varid for designated initializer?
+                      "2: void f0 ( S s@2 ) ;\n"
+                      "3: void f1 ( int n@3 ) {\n"
+                      "4: if ( int x@4 = n@3 ) {\n"
+                      "5: f0 ( S { . x = x@4 } ) ;\n"
+                      "6: }\n"
+                      "7: }\n",
+                      tokenize("struct S { int x; };\n"
+                               "void f0(S s);\n"
+                               "void f1(int n) {\n"
+                               "    if (int x = n) {\n"
+                               "        f0(S{ .x = x });\n"
+                               "    }\n"
+                               "}\n"));
     }
 
     void varid_arrayinit() {