Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions lib/vf_common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,13 @@ namespace ValueFlow
value.setKnown();
setTokenValue(tok, std::move(value), settings);
} else if (Token::simpleMatch(tok, "sizeof (")) {
if (tok->next()->astOperand2() && !tok->next()->astOperand2()->isLiteral() && tok->next()->astOperand2()->valueType() &&
(tok->next()->astOperand2()->valueType()->pointer == 0 || // <- TODO this is a bailout, abort when there are array->pointer conversions
(tok->next()->astOperand2()->variable() && !tok->next()->astOperand2()->variable()->isArray())) &&
!tok->next()->astOperand2()->valueType()->isEnum()) { // <- TODO this is a bailout, handle enum with non-int types
const size_t sz = tok->next()->astOperand2()->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ValueType::SizeOf::Pointer);
const Token* const obj = tok->next()->astOperand2();
if (obj && !obj->isLiteral() && obj->valueType() &&
(obj->valueType()->pointer == 0 || // <- TODO this is a bailout, abort when there are array->pointer conversions
(obj->variable() && !obj->variable()->isArray())) &&
!obj->valueType()->isEnum()) { // <- TODO this is a bailout, handle enum with non-int types
const auto ptrPointee = obj->valueType()->pointer > 0 ? ValueType::SizeOf::Pointer : ValueType::SizeOf::Pointee;
const size_t sz = obj->valueType()->getSizeOf(settings, ValueType::Accuracy::ExactOrZero, ptrPointee);
if (sz) {
Value value(sz);
value.setKnown();
Expand Down
24 changes: 24 additions & 0 deletions test/testvalueflow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1396,6 +1396,30 @@ class TestValueFlow : public TestFixture {
ASSERT_EQUALS(1U, values.size());
ASSERT_EQUALS(4, values.back().intvalue);

code = "char& r = i;\n"
"sizeof(r);";
values = tokenValues(code, "( r");
ASSERT_EQUALS(1U, values.size());
ASSERT_EQUALS(1, values.back().intvalue);

code = "char* p;\n"
"sizeof(p);";
values = tokenValues(code, "( p");
ASSERT_EQUALS(1U, values.size());
ASSERT_EQUALS(settings.platform.sizeof_pointer, values.back().intvalue);

code = "char*& pr = p;\n"
"sizeof(pr);";
values = tokenValues(code, "( pr");
ASSERT_EQUALS(1U, values.size());
ASSERT_EQUALS(settings.platform.sizeof_pointer, values.back().intvalue);

code = "struct { char& r; char* p; } s{ x, y };\n"
"sizeof(s);\n";
values = tokenValues(code, "( s");
ASSERT_EQUALS(1U, values.size());
ASSERT_EQUALS(2 * settings.platform.sizeof_pointer, values.back().intvalue);

#define CHECK3(A, B, C) \
do { \
code = "void f() {\n" \
Expand Down
Loading