mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-27 05:30:13 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix Issue 23427 - ImportC: some bitfield combinations lead to wrong size struct (#15110)

Browse source
This commit is contained in:
Walter Bright 2023-04-17 02:42:44 -07:00 • committed by GitHub
parent 504d9dd80c
commit c170baf978
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 166 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/src/dmd/backend/cgelem.d
View file

@ -3215,7 +3215,6 @@ L1:
@trusted
private elem * elbit(elem *e, goal_t goal)
{
tym_t tym1 = e.EV.E1.Ety;
uint sz = tysize(tym1) * 8;
elem *e2 = e.EV.E2;

9
compiler/src/dmd/declaration.d
View file

@ -1934,8 +1934,12 @@ extern (C++) class BitFieldDeclaration : VarDeclaration
{
// If the bit-field spans more units of alignment than its type,
// start a new field at the next alignment boundary.
if (fieldState.bitOffset == fieldState.fieldSize * 8)
if (fieldState.bitOffset == fieldState.fieldSize * 8 &&
fieldState.bitOffset + fieldWidth > memalignsize * 8)
{
if (log) printf("more units of alignment than its type\n");
startNewField(); // the bit field is full
}
else
{
// if alignment boundary is crossed
@ -1944,7 +1948,7 @@ extern (C++) class BitFieldDeclaration : VarDeclaration
//printf("%s start: %d end: %d memalignsize: %d\n", ad.toChars(), start, end, memalignsize);
if (start / (memalignsize * 8) != (end - 1) / (memalignsize * 8))
{
//printf("alignment is crossed\n");
if (log) printf("alignment is crossed\n");
startNewField();
}
}
@ -1984,6 +1988,7 @@ extern (C++) class BitFieldDeclaration : VarDeclaration
fieldState.bitOffset = pastField;
}
//printf("\t%s: offset = %d bitOffset = %d fieldWidth = %d memsize = %d\n", toChars(), offset, bitOffset, fieldWidth, memsize);
//printf("\t%s: memalignsize = %d\n", toChars(), memalignsize);
//printf(" addField '%s' to '%s' at offset %d, size = %d\n", toChars(), ad.toChars(), offset, memsize);
}

159
compiler/test/compilable/posixbitfields.c Normal file
View file

@ -0,0 +1,159 @@
// DISABLED: win32 win64
// https://issues.dlang.org/show_bug.cgi?id=23427
_Static_assert(sizeof(unsigned) == 4, "1");
struct A {
unsigned x :8;
unsigned y :4;
unsigned z :20;
};
_Static_assert(sizeof(struct A)==4, "2");
struct B {
unsigned x :4;
unsigned y :2;
unsigned z :26;
};
_Static_assert(sizeof(struct B)==4, "3");
struct C {
unsigned x :4;
unsigned y :4;
unsigned z :24;
};
_Static_assert(sizeof(struct C)==4, "4"); // This one fails
_Static_assert(sizeof(struct {
unsigned a: 1;
unsigned b: 7;
unsigned c: 24;
}) == sizeof(unsigned), "1 7 24");
_Static_assert(sizeof(struct {
unsigned a: 2;
unsigned b: 6;
unsigned c: 24;
}) == sizeof(unsigned), "2 6 24");
_Static_assert(sizeof(struct {
unsigned a: 3;
unsigned b: 5;
unsigned c: 24;
}) == sizeof(unsigned), "3 5 24");
_Static_assert(sizeof(struct {
unsigned a: 4;
unsigned b: 4;
unsigned c: 24;
}) == sizeof(unsigned), "4 4 24");
_Static_assert(sizeof(struct {
unsigned a: 5;
unsigned b: 3;
unsigned c: 24;
}) == sizeof(unsigned), "5 3 24");
_Static_assert(sizeof(struct {
unsigned a: 6;
unsigned b: 2;
unsigned c: 24;
}) == sizeof(unsigned), "6 2 24");
_Static_assert(sizeof(struct {
unsigned a: 7;
unsigned b: 1;
unsigned c: 24;
}) == sizeof(unsigned), "7 1 24");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 9;
unsigned c: 15;
}) == sizeof(unsigned), "8 9 15");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 10;
unsigned c: 14;
}) == sizeof(unsigned), "8 10 14");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 11;
unsigned c: 13;
}) == sizeof(unsigned), "8 11 13");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 12;
unsigned c: 12;
}) == sizeof(unsigned), "8 12 12");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 13;
unsigned c: 11;
}) == sizeof(unsigned), "8 13 11");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 14;
unsigned c: 10;
}) == sizeof(unsigned), "8 14 10");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 15;
unsigned c: 9;
}) == sizeof(unsigned), "8 15 9");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 16;
unsigned c: 8;
}) == sizeof(unsigned), "8 16 8");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 17;
unsigned c: 7;
}) == sizeof(unsigned), "8 17 7");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 18;
unsigned c: 6;
}) == sizeof(unsigned), "8 18 6");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 19;
unsigned c: 5;
}) == sizeof(unsigned), "8 19 5");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 20;
unsigned c: 4;
}) == sizeof(unsigned), "8 20 4");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 21;
unsigned c: 3;
}) == sizeof(unsigned), "8 21 3");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 22;
unsigned c: 2;
}) == sizeof(unsigned), "8 22 2");
_Static_assert(sizeof(struct {
unsigned a: 8;
unsigned b: 23;
unsigned c: 1;
}) == sizeof(unsigned), "8 23 1");