From d2716a72cb6875e5877f86c99ab54dd4934b36ac Mon Sep 17 00:00:00 2001 From: chrchr Date: Tue, 9 Jan 2024 13:19:13 +0100 Subject: [PATCH] Fix FP initializerList with base member --- lib/checkclass.cpp | 2 ++ test/testclass.cpp | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp index 5934dcd8556..f1a87685b4c 100644 --- a/lib/checkclass.cpp +++ b/lib/checkclass.cpp @@ -2675,6 +2675,8 @@ void CheckClass::initializerListOrder() const Token* const end = tok->next()->link(); for (; tok != end; tok = tok->next()) { if (const Variable* argVar = scope->getVariable(tok->str())) { + if (scope != argVar->scope()) + continue; if (var->isPointer() && (argVar->isArray() || Token::simpleMatch(tok->astParent(), "&"))) continue; if (var->isReference()) diff --git a/test/testclass.cpp b/test/testclass.cpp index f6dddcdce36..abb77819b5b 100644 --- a/test/testclass.cpp +++ b/test/testclass.cpp @@ -7623,6 +7623,15 @@ class TestClass : public TestFixture { " int i{};\n" "};"); ASSERT_EQUALS("", errout.str()); + + checkInitializerListOrder("struct B {\n" + " int a{}, b{};\n" + "};\n" + "struct D : B {\n" + " D() : B(), j(b) {}\n" + " int j;\n" + "};"); + ASSERT_EQUALS("", errout.str()); } #define checkInitializationListUsage(code) checkInitializationListUsage_(code, __FILE__, __LINE__)