Skip to content

fix #13995: performance regression (hang) in 2.18dev #7653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 2 commits into from
Jul 8, 2025
Merged

fix #13995: performance regression (hang) in 2.18dev #7653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c73173
add test
ludviggunne Jul 7, 2025
69b2408
fix #13995
ludviggunne Jul 7, 2025
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
4 changes: 2 additions & 2 deletions lib/valueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,8 @@ size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings &settings, Accur
const size_t charBit = settings.platform.char_bit;
size_t n = ValueFlow::getSizeOf(vt2, settings,accuracy, ++maxRecursion);
size_t a = getAlignOf(vt2, settings, accuracy);
if (n == 0 || a == 0)
return accuracy == Accuracy::ExactOrZero ? 0 : total;
if (bits == 0) {
if (currentBitfieldAlloc == 0) {
bits = n * charBit;
Expand All @@ -565,8 +567,6 @@ size_t ValueFlow::getSizeOf(const ValueType &vt, const Settings &settings, Accur
currentBitCount += bits;
return ret;
}
if (n == 0 || a == 0)
return accuracy == Accuracy::ExactOrZero ? 0 : total;
n *= dim;
size_t padding = (a - (total % a)) % a;
if (currentBitCount > 0) {
Expand Down
8 changes: 8 additions & 0 deletions test/testvalueflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ class TestValueFlow : public TestFixture {

TEST_CASE(performanceIfCount);
TEST_CASE(bitfields);

TEST_CASE(bitfieldsHang);
}

static bool isNotTokValue(const ValueFlow::Value &val) {
Expand Down Expand Up @@ -9136,6 +9138,12 @@ class TestValueFlow : public TestFixture {
testBitfields("unsigned char a : 16;\n",
2);
}

void bitfieldsHang() {
const char *code = "struct S { unknown_type x : 1; };\n"
"const size_t size = sizeof(S);\n";
(void)valueOfTok(code, "x");
}
};

REGISTER_TEST(TestValueFlow)