Fix FP

danmar · Jan 6, 2024 · e62c282 · e62c282
1 parent 9cd89c7
commit e62c282
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -2674,8 +2674,11 @@ void CheckClass::initializerListOrder()
 
                             const Token* const end = tok->next()->link();
                             for (const Token* tok2 = tok->next(); tok2 != end; tok2 = tok2->next()) {
-                                if (const Variable* var2 = scope->getVariable(tok2->str()))
+                                if (const Variable* var2 = scope->getVariable(tok2->str())) {
+                                    if (var->isPointer() && var2->isArray())
+                                        continue;
                                     vars.back().initArgs.emplace_back(var2);
+                                }
                             }
                             tok = end;
                         }

diff --git a/test/testclass.cpp b/test/testclass.cpp
@@ -7596,6 +7596,13 @@ class TestClass : public TestFixture {
                                   "    int a, b, c;\n"
                                   "};");
         ASSERT_EQUALS("", errout.str());
+
+        checkInitializerListOrder("struct S {\n"
+                                  "    S() : p(a) {}\n"
+                                  "    int* p;\n"
+                                  "    int a[1];\n"
+                                  "};");
+        ASSERT_EQUALS("", errout.str());
     }
 
 #define checkInitializationListUsage(code) checkInitializationListUsage_(code, __FILE__, __LINE__)