From b2705e6fca6a11699e0f6229fb0daaefbee9000c Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Thu, 12 Nov 2026 15:28:15 +0100 Subject: [PATCH 1/5] Update astutils.cpp --- lib/astutils.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/astutils.cpp b/lib/astutils.cpp index e2e19b6bd91..2e00a391935 100644 --- a/lib/astutils.cpp +++ b/lib/astutils.cpp @@ -3432,14 +3432,15 @@ static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Library& if (!ftok) return ExprUsage::None; const Function* func = ftok->function(); + const Variable* var = ftok->variable(); // variable init/constructor call? - if (!func && ftok->variable() && ftok == ftok->variable()->nameToken()) { - // STL types or containers don't initialize external variables - if (indirect == 0 && (ftok->variable()->isStlType() || (ftok->variable()->valueType() && ftok->variable()->valueType()->container))) + if (!func && var && ftok == var->nameToken()) { + // STL types/containers/primitive types don't initialize external variables + if (indirect == 0 && (var->isStlType() || (var->valueType() && (var->valueType()->container || var->valueType()->type > ValueType::Type::VOID)))) return ExprUsage::Used; // TODO: resolve multiple constructors - if (ftok->variable()->type() && ftok->variable()->type()->classScope) { - const int nCtor = ftok->variable()->type()->classScope->numConstructors; + if (var->type() && var->type()->classScope) { + const int nCtor = var->type()->classScope->numConstructors; if (nCtor == 0) { if (indirect > 0) { const std::vector argvar = getArgumentVars(ftok->astParent(), argnr); @@ -3449,7 +3450,7 @@ static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Library& return ExprUsage::Used; } if (nCtor == 1) { - const Scope* scope = ftok->variable()->type()->classScope; + const Scope* scope = var->type()->classScope; auto it = std::find_if(scope->functionList.begin(), scope->functionList.end(), [](const Function& f) { return f.isConstructor(); }); From f77e99883d2eb343148abe8860e4cd8cca677306 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Thu, 12 Nov 2026 15:29:13 +0100 Subject: [PATCH 2/5] Update testuninitvar.cpp --- test/testuninitvar.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp index 9e9f2ed1b98..ffe7cd2ae96 100644 --- a/test/testuninitvar.cpp +++ b/test/testuninitvar.cpp @@ -6860,6 +6860,20 @@ class TestUninitVar : public TestFixture { " return a[0];\n" "}\n"); ASSERT_EQUALS("", errout_str()); + + valueFlowUninit("int f() {\n" // #15210 + " int a;\n" + " int b{ a };\n" + " return b;\n" + "}\n" + "int g() {\n" + " int a;\n" + " int b(a);\n" + " return b;\n" + "}\n"); + ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: a [uninitvar]\n" + "[test.cpp:8:11]: (error) Uninitialized variable: a [uninitvar]\n", + errout_str()); } void valueFlowUninitBreak() { // Do not show duplicate warnings about the same uninitialized value From 3a2d01e88d8b54151ec25063c2ffe4b2af9e84c5 Mon Sep 17 00:00:00 2001 From: chrchr-github Date: Thu, 12 Nov 2026 18:30:21 +0100 Subject: [PATCH 3/5] Use isPrimitive() --- lib/astutils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/astutils.cpp b/lib/astutils.cpp index 2e00a391935..19e1aab275a 100644 --- a/lib/astutils.cpp +++ b/lib/astutils.cpp @@ -3436,7 +3436,7 @@ static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Library& // variable init/constructor call? if (!func && var && ftok == var->nameToken()) { // STL types/containers/primitive types don't initialize external variables - if (indirect == 0 && (var->isStlType() || (var->valueType() && (var->valueType()->container || var->valueType()->type > ValueType::Type::VOID)))) + if (indirect == 0 && (var->isStlType() || (var->valueType() && (var->valueType()->container || var->valueType()->isPrimitive())))) return ExprUsage::Used; // TODO: resolve multiple constructors if (var->type() && var->type()->classScope) { From 1d5d0a41d3c251426fa11d0c1490f213fd440919 Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Fri, 13 Nov 2026 07:47:52 +0100 Subject: [PATCH 4/5] Update astutils.cpp [skip ci] --- lib/astutils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/astutils.cpp b/lib/astutils.cpp index 19e1aab275a..a08d86a2f86 100644 --- a/lib/astutils.cpp +++ b/lib/astutils.cpp @@ -3436,7 +3436,7 @@ static ExprUsage getFunctionUsage(const Token* tok, int indirect, const Library& // variable init/constructor call? if (!func && var && ftok == var->nameToken()) { // STL types/containers/primitive types don't initialize external variables - if (indirect == 0 && (var->isStlType() || (var->valueType() && (var->valueType()->container || var->valueType()->isPrimitive())))) + if (indirect == 0 && (var->isStlType() || (var->valueType() && (var->valueType()->container || (var->valueType()->isPrimitive() && !var->isReference()))))) return ExprUsage::Used; // TODO: resolve multiple constructors if (var->type() && var->type()->classScope) { From cc27f2ef6eb5d3692a933b43b90b2c16950a38aa Mon Sep 17 00:00:00 2001 From: chrchr-github <78114321+chrchr-github@users.noreply.github.com> Date: Fri, 13 Nov 2026 07:50:03 +0100 Subject: [PATCH 5/5] Update testuninitvar.cpp --- test/testuninitvar.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp index ffe7cd2ae96..5ded7ad8feb 100644 --- a/test/testuninitvar.cpp +++ b/test/testuninitvar.cpp @@ -6870,6 +6870,12 @@ class TestUninitVar : public TestFixture { " int a;\n" " int b(a);\n" " return b;\n" + "}\n" + "int h() {\n" + " int a;\n" + " int& b{ a };\n" + " b = 0;\n" + " return b;\n" "}\n"); ASSERT_EQUALS("[test.cpp:3:12]: (error) Uninitialized variable: a [uninitvar]\n" "[test.cpp:8:11]: (error) Uninitialized variable: a [uninitvar]\n",