Fix #11488 FP unknownEvaluationOrder with designated initializers (#7049

)
danmar · Nov 29, 2024 · 1869eca · 1869eca
1 parent 5c54e72
commit 1869eca
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -1734,6 +1734,8 @@ void SymbolDatabase::createSymbolDatabaseExprIds()
                     continue;
                 if (tok->isControlFlowKeyword())
                     continue;
+                if (Token::Match(tok->tokAt(-1), ". %name%") && Token::Match(tok->tokAt(-2), "[{,]")) // designated initializers
+                    continue;
 
                 if (Token::Match(tok, "%name% <") && tok->linkAt(1)) {
                     tok->exprId(id);

diff --git a/test/testvarid.cpp b/test/testvarid.cpp
@@ -252,6 +252,7 @@ class TestVarID : public TestFixture {
         TEST_CASE(exprid10);
         TEST_CASE(exprid11);
         TEST_CASE(exprid12);
+        TEST_CASE(exprid13);
 
         TEST_CASE(structuredBindings);
     }
@@ -4334,6 +4335,23 @@ class TestVarID : public TestFixture {
         ASSERT_EQUALS(exp, tokenizeExpr(code));
     }
 
+    void exprid13()
+    {
+        const char code[] = "struct S { int s; };\n" // #11488
+                            "struct T { struct S s; };\n"
+                            "struct U { struct T t; };\n"
+                            "void f() {\n"
+                            "    struct U u = { .t = { .s = { .s = 1 } } };\n"
+                            "}\n";
+        const char* exp = "1: struct S { int s ; } ;\n"
+                          "2: struct T { struct S s ; } ;\n"
+                          "3: struct U { struct T t ; } ;\n"
+                          "4: void f ( ) {\n"
+                          "5: struct U u@4 ; u@4 = { .@UNIQUE t@5 = { . s = { . s = 1 } } } ;\n"
+                          "6: }\n";
+        ASSERT_EQUALS(exp, tokenizeExpr(code));
+    }
+
     void structuredBindings() {
         const char code[] = "int foo() { auto [x,y] = xy(); return x+y; }";
         ASSERT_EQUALS("1: int foo ( ) { auto [ x@1 , y@2 ] = xy ( ) ; return x@1 + y@2 ; }\n",