Fix #12730 FP initializerList - name clash? (danmar#6402)

chrchr-github · May 15, 2024 · b5cb0f8 · b5cb0f8
1 parent 994c015
commit b5cb0f8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -2682,6 +2682,8 @@ void CheckClass::initializerListOrder()
                                 tok = end;
 
                             for (; tok != end; tok = tok->next()) {
+                                if (Token::Match(tok->astParent(), ".|::"))
+                                    continue;
                                 if (const Variable* argVar = scope->getVariable(tok->str())) {
                                     if (scope != argVar->scope())
                                         continue;

diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -7645,6 +7645,22 @@ class TestClass : public TestFixture {
                                   "};\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:4]: (style, inconclusive) Member variable 'Foo::a' uses an uninitialized argument 'b' due to the order of declarations.\n",
                       errout_str());
+
+        checkInitializerListOrder("struct S { double d = 0; };\n" // #12730
+                                  "struct T {\n"
+                                  "    T() : s(), a(s.d), d(0) {}\n"
+                                  "    S s;\n"
+                                  "    double a, d;\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout_str());
+
+        checkInitializerListOrder("struct S { static const int d = 1; };\n"
+                                  "struct T {\n"
+                                  "    T() : s(), a(S::d), d(0) {}\n"
+                                  "    S s;\n"
+                                  "    int a, d;\n"
+                                  "};\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
 #define checkInitializationListUsage(code) checkInitializationListUsage_(code, __FILE__, __LINE__)