diff --git a/lib/astutils.cpp b/lib/astutils.cpp index 2d53ef0b0c1..64f28b8506d 100644 --- a/lib/astutils.cpp +++ b/lib/astutils.cpp @@ -3670,21 +3670,27 @@ bool isGlobalData(const Token *expr) globalData = true; return ChildrenToVisit::none; } - if (Token::Match(tok, "[*[]") && tok->astOperand1() && tok->astOperand1()->variable()) { + if (Token::Match(tok, "[*[]") && tok->astOperand1()) { // TODO check if pointer points at local data - const Variable *lhsvar = tok->astOperand1()->variable(); - const ValueType *lhstype = tok->astOperand1()->valueType(); - if (lhsvar->isPointer() || !lhstype || lhstype->type == ValueType::Type::ITERATOR) { - globalData = true; - return ChildrenToVisit::none; - } - if (lhsvar->isArgument() && lhsvar->isArray()) { - globalData = true; - return ChildrenToVisit::none; + const Token *lhs = tok->astOperand1(); + if (!lhs->variable() && lhs->isCast()) { + lhs = lhs->astOperand1(); } - if (lhsvar->isArgument() && lhstype->type <= ValueType::Type::VOID && !lhstype->container) { - globalData = true; - return ChildrenToVisit::none; + if (lhs && lhs->variable()) { + const Variable *lhsvar = lhs->variable(); + const ValueType *lhstype = lhs->valueType(); + if (lhsvar->isPointer() || !lhstype || lhstype->type == ValueType::Type::ITERATOR) { + globalData = true; + return ChildrenToVisit::none; + } + if (lhsvar->isArgument() && lhsvar->isArray()) { + globalData = true; + return ChildrenToVisit::none; + } + if (lhsvar->isArgument() && lhstype->type <= ValueType::Type::VOID && !lhstype->container) { + globalData = true; + return ChildrenToVisit::none; + } } } if (tok->varId() == 0 && tok->isName() && tok->strAt(-1) != ".") { diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp index e5f4c08f043..1b4cade2fa4 100644 --- a/test/testunusedvar.cpp +++ b/test/testunusedvar.cpp @@ -271,6 +271,8 @@ class TestUnusedVar : public TestFixture { TEST_CASE(globalData); TEST_CASE(structuredBinding); // #13269 + + TEST_CASE(pointerCast); // #14535 } struct FunctionVariableUsageOptions @@ -7308,6 +7310,15 @@ class TestUnusedVar : public TestFixture { "}\n"); ASSERT_EQUALS("", errout_str()); } + + void pointerCast() { // #14535 + functionVariableUsage("void f(int* p)\n" + "{\n" + " int* p2 = p;\n" + " ((int *)(p2))[0] = 0; // remove cast for warning to disappear\n" + "}\n"); + ASSERT_EQUALS("", errout_str()); + } }; REGISTER_TEST(TestUnusedVar)