diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp index dd30f65db58..56b72ebb55c 100644 --- a/lib/checkunusedvar.cpp +++ b/lib/checkunusedvar.cpp @@ -1680,6 +1680,29 @@ void CheckUnusedVarImpl::checkStructMemberUsage() if (use) break; } + // Class used in template with unknown definition + if (Token::Match(tok, "%name% <") && tok->next()->link()) { + if (tok->function()) + continue; + if (tok->type() && tok->type()->classScope) + continue; + { + const Token *start = tok; + while (Token::Match(start->previous(), "%name%|::")) + start = start->previous(); + if (mSettings.library.detectContainer(start)) + continue; + } + const Token *end = tok->next()->link(); + for (; tok != end; tok = tok->next()) { + if (tok->type() && tok->type()->classScope == &scope) { + use = true; + break; + } + } + if (use) + break; + } if (tok->variable() != &var) continue; if (tok != var.nameToken()) { diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp index ae44305ef6a..2a92ed8522f 100644 --- a/test/testunusedvar.cpp +++ b/test/testunusedvar.cpp @@ -80,6 +80,8 @@ class TestUnusedVar : public TestFixture { TEST_CASE(structmember32); // #14483 TEST_CASE(structmember33); TEST_CASE(structmember34); + TEST_CASE(structmember35); + TEST_CASE(structmember36); TEST_CASE(structmember_macro); TEST_CASE(structmember_template_argument); // #13887 - do not report that member used in template argument is unused TEST_CASE(classmember); @@ -2101,6 +2103,18 @@ class TestUnusedVar : public TestFixture { ASSERT_EQUALS("[test.cpp:2:24]: (style) struct member 'S::p' is never used. [unusedStructMember]\n", errout_str()); } + void structmember35() { + checkStructMemberUsage("struct S { int i; };\n" + "int f() { return g(); }\n"); + ASSERT_EQUALS("", errout_str()); + } + + void structmember36() { + checkStructMemberUsage("struct S { int i; };\n" + "int f() { A *a = nullptr; (void) a; }\n"); + ASSERT_EQUALS("", errout_str()); + } + void structmember_macro() { checkStructMemberUsageP("#define S(n) struct n { int a, b, c; };\n" "S(unused);\n");