Fix FP initializerList with static member (#5864)

danmar · Jan 9, 2024 · 30397f0 · 30397f0
1 parent 9fceba4
commit 30397f0
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
@@ -2677,6 +2677,10 @@ void CheckClass::initializerListOrder()
                                 if (const Variable* argVar = scope->getVariable(tok->str())) {
                                     if (scope != argVar->scope())
                                         continue;
+                                    if (argVar->isStatic())
+                                        continue;
+                                    if (tok->variable() && tok->variable()->isArgument())
+                                        continue;
                                     if (var->isPointer() && (argVar->isArray() || Token::simpleMatch(tok->astParent(), "&")))
                                         continue;
                                     if (var->isReference())

diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -7632,6 +7632,20 @@ class TestClass : public TestFixture {
                                   "    int j;\n"
                                   "};");
         ASSERT_EQUALS("", errout.str());
+
+        checkInitializerListOrder("struct S {\n"
+                                  "    S() : a(i) {}\n"
+                                  "    int a;\n"
+                                  "    static int i;\n"
+                                  "};\n"
+                                  "int S::i = 0;");
+        ASSERT_EQUALS("", errout.str());
+
+        checkInitializerListOrder("struct S {\n"
+                                  "    S(int b) : a(b) {}\n"
+                                  "    int a, b{};\n"
+                                  "};");
+        ASSERT_EQUALS("", errout.str());
     }
 
 #define checkInitializationListUsage(code) checkInitializationListUsage_(code, __FILE__, __LINE__)