Skip to content

[CIR] Fix outdated bitfield iteration logic in accumulateFields #151741

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
Andres-Salamanca merged 1 commit into from
Aug 2, 2025
Merged

[CIR] Fix outdated bitfield iteration logic in accumulateFields #151741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions clang/lib/CIR/CodeGen/CIRGenRecordLayoutBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,11 +499,7 @@ void CIRRecordLowering::accumulateFields() {
fieldEnd = recordDecl->field_end();
field != fieldEnd;) {
if (field->isBitField()) {
RecordDecl::field_iterator start = field;
// Iterate to gather the list of bitfields.
for (++field; field != fieldEnd && field->isBitField(); ++field)
;
field = accumulateBitFields(start, field);
field = accumulateBitFields(field, fieldEnd);
assert((field == fieldEnd || !field->isBitField()) &&
"Failed to accumulate all the bitfields");
} else if (!field->isZeroSize(astContext)) {
Expand Down
11 changes: 11 additions & 0 deletions clang/test/CIR/CodeGen/bitfields.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,23 @@ typedef struct {
// LLVM-DAG: %struct.U = type <{ i8, i8, i8, i8, i64 }>
// OGCG-DAG: %struct.U = type <{ i8, i8, i8, i8, i64 }>

typedef struct{
int a : 24;
char b;
int c: 30;
} Clip;

// CIR-DAG: !rec_Clip = !cir.record<struct "Clip" {!cir.array<!u8i x 3>, !s8i, !u32i}>
// LLVM-DAG: %struct.Clip = type { [3 x i8], i8, i32 }
// OGCG-DAG: %struct.Clip = type { [3 x i8], i8, i32 }

void def() {
A a;
D d;
S s;
T t;
U u;
Clip c;
}

int load_field(S* s) {
Expand Down