mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 13:10:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix 18127 - ImportC: redeclaration of struct in different translation unit doesn’t check compatibility (#21224)

Browse source 
Fixes: https://github.com/dlang/dmd/issues/18127

When merging struct definitions from different C imports, check that the
structs are actually compatible according to the C rules. If they are
not, issue an error.
This commit is contained in:
drpriver 2025-04-13 23:35:20 -07:00 • committed by GitHub
parent 605fb8bf5b
commit 8a8746f318
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 661 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

74
compiler/test/compilable/imports/imp18127a.c Normal file
View file

@ -0,0 +1,74 @@
// https://github.com/dlang/dmd/issues/18127
union struct_or_union {
int x;
};
struct S_n_fields {
int x, y;
};
struct S_types {
float x;
};
struct S_names {
float x;
};
struct B {
int x;
};
struct S_b {
struct B b;
};
struct S_contains_anon_named {
struct {
int x;
} a;
};
struct S_contains_anon_unnamed {
struct {
int x;
};
};
struct S_bitfields_mismatch1 {
unsigned x: 3;
unsigned y: 1;
};
struct S_bitfields_mismatch2 {
unsigned x;
unsigned y: 1;
};
struct S_bitfields_widths {
unsigned x: 3;
unsigned y: 1;
};
struct S_bitfields_anon {
unsigned x: 3;
unsigned : 1;
};
struct S_alignas {
_Alignas(8) float x;
};
struct S_aligned {
float x;
}__attribute__((aligned(8)));
struct __attribute__((packed)) S_pack_1 {
float x;
char c;
};
#pragma pack(push)
#pragma pack(1)
struct S_pack_2 {
float x;
char c;
};
#pragma pack(pop)

74
compiler/test/compilable/imports/imp18127b.c Normal file
View file

@ -0,0 +1,74 @@
// https://github.com/dlang/dmd/issues/18127
union struct_or_union {
int x;
};
struct S_n_fields {
int x, y;
};
struct S_types {
float x;
};
struct S_names {
float x;
};
struct B {
int x;
};
struct S_b {
struct B b;
};
struct S_contains_anon_named {
struct {
int x;
} a;
};
struct S_contains_anon_unnamed {
struct {
int x;
};
};
struct S_bitfields_mismatch1 {
unsigned x: 3;
unsigned y: 1;
};
struct S_bitfields_mismatch2 {
unsigned x;
unsigned y: 1;
};
struct S_bitfields_widths {
unsigned x: 3;
unsigned y: 1;
};
struct S_bitfields_anon {
unsigned x: 3;
unsigned : 1;
};
struct S_alignas {
_Alignas(8) float x;
};
struct S_aligned {
float x;
}__attribute__((aligned(8)));
struct __attribute__((packed)) S_pack_1 {
float x;
char c;
};
#pragma pack(push)
#pragma pack(1)
struct S_pack_2 {
float x;
char c;
};
#pragma pack(pop)

4
compiler/test/compilable/test18127.d Normal file
View file

@ -0,0 +1,4 @@
// https://github.com/dlang/dmd/issues/18127
import imports.imp18127a;
import imports.imp18127b;

83
compiler/test/fail_compilation/imports/imp18127a.c Normal file
View file

@ -0,0 +1,83 @@
// https://github.com/dlang/dmd/issues/18127
// union in here, struct in other
union struct_or_union {
int x;
};
// mismatching number of fields
struct S_n_fields {
int x, y;
};
// mismatched types
struct S_types {
float x;
};
// mismatched names
struct S_names {
float x;
};
struct B {
int x;
};
// Contains a struct that is incompatible
struct S_b {
struct B b;
};
// mismatched anonymous struct
struct S_contains_anon_named {
struct {
int x;
} a;
};
struct S_contains_anon_unnamed {
struct {
int x;
};
};
// bitfields
struct S_bitfields_mismatch1 {
unsigned x: 3;
unsigned y: 1;
};
struct S_bitfields_mismatch2 {
unsigned x;
unsigned y: 1;
};
struct S_bitfields_widths {
unsigned x: 3;
unsigned y: 1;
};
struct S_bitfields_anon {
unsigned x: 3;
unsigned : 1;
};
// mismatched alignment
struct S_alignas {
_Alignas(8) float x;
};
struct S_aligned {
float x;
}__attribute__((aligned(8)));
// mismatched packing
struct __attribute__((packed)) S_pack_1 {
float x;
char c;
};
#pragma pack(push)
#pragma pack(1)
struct S_pack_2 {
float x;
char c;
};
#pragma pack(pop)

80
compiler/test/fail_compilation/imports/imp18127b.c Normal file
View file

@ -0,0 +1,80 @@
// https://github.com/dlang/dmd/issues/18127
// struct in here, union in other
struct struct_or_union {
int x;
};
// mismatching number of fields
struct S_n_fields {
int x;
};
// mismatched types
struct S_types {
int x;
};
// mismatched names
struct S_names {
float y;
};
struct B {
float x;
};
// Contains a struct that is incompatible
struct S_b {
struct B b;
};
// mismatched anonymous struct
struct S_contains_anon_named {
struct {
float x;
} a;
};
struct S_contains_anon_unnamed {
struct {
float x;
};
};
// bitfields
struct S_bitfields_mismatch1 {
unsigned x: 3;
unsigned y;
};
struct S_bitfields_mismatch2 {
unsigned x: 3;
unsigned y: 1;
};
struct S_bitfields_widths {
unsigned x: 3;
unsigned y: 2;
};
struct S_bitfields_anon {
unsigned x: 3;
unsigned y: 1;
};
// mismatched alignment
struct S_alignas {
float x;
};
struct S_aligned {
float x;
}__attribute__((aligned(4)));
// mismatched packing
struct S_pack_1 {
float x;
char c;
};
struct S_pack_2 {
float x;
char c;
};

106
compiler/test/fail_compilation/test18127.d Normal file
View file

@ -0,0 +1,106 @@
/*
TEST_OUTPUT:
---
fail_compilation/imports/imp18127b.c(3): Error: struct `struct_or_union` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(3): previously declared here
fail_compilation/imports/imp18127b.c(3): `imp18127b.struct_or_union` is a struct while `imp18127a.struct_or_union` is a union
fail_compilation/imports/imp18127b.c(3): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(8): Error: struct `S_n_fields` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(8): previously declared here
fail_compilation/imports/imp18127b.c(8): `imp18127b.S_n_fields` has 1 field(s) while `imp18127a.S_n_fields` has 2 field(s)
fail_compilation/imports/imp18127b.c(8): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(13): Error: struct `S_types` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(13): previously declared here
fail_compilation/imports/imp18127b.c(14): Field 0 differs in type
fail_compilation/imports/imp18127b.c(14): typeof(x): int
fail_compilation/imports/imp18127a.c(14): typeof(x): float
fail_compilation/imports/imp18127b.c(13): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(18): Error: struct `S_names` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(18): previously declared here
fail_compilation/imports/imp18127b.c(19): Field 0 differs in name
fail_compilation/imports/imp18127b.c(19): y
fail_compilation/imports/imp18127a.c(19): x
fail_compilation/imports/imp18127b.c(18): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(22): Error: struct `B` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(22): previously declared here
fail_compilation/imports/imp18127b.c(23): Field 0 differs in type
fail_compilation/imports/imp18127b.c(23): typeof(x): float
fail_compilation/imports/imp18127a.c(23): typeof(x): int
fail_compilation/imports/imp18127b.c(22): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(27): Error: struct `S_b` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(27): previously declared here
fail_compilation/imports/imp18127b.c(27): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(33): Error: struct `(anonymous struct)` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(33): previously declared here
fail_compilation/imports/imp18127b.c(34): Field 0 differs in type
fail_compilation/imports/imp18127b.c(34): typeof(x): float
fail_compilation/imports/imp18127a.c(34): typeof(x): int
fail_compilation/imports/imp18127b.c(32): Error: struct `S_contains_anon_named` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(32): previously declared here
fail_compilation/imports/imp18127b.c(35): Field 0 differs in type
fail_compilation/imports/imp18127b.c(35): typeof(a): (anonymous struct)
fail_compilation/imports/imp18127a.c(35): typeof(a): (anonymous struct)
fail_compilation/imports/imp18127b.c(32): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(38): Error: struct `S_contains_anon_unnamed` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(38): previously declared here
fail_compilation/imports/imp18127b.c(40): Field 0 differs in type
fail_compilation/imports/imp18127b.c(40): typeof(x): float
fail_compilation/imports/imp18127a.c(40): typeof(x): int
fail_compilation/imports/imp18127b.c(38): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(45): Error: struct `S_bitfields_mismatch1` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(45): previously declared here
fail_compilation/imports/imp18127b.c(47): Field 1 differs in being a bitfield
fail_compilation/imports/imp18127b.c(47): `imp18127b.S_bitfields_mismatch1.y` is not a bitfield
fail_compilation/imports/imp18127a.c(47): `imp18127a.S_bitfields_mismatch1.y` is a bitfield
fail_compilation/imports/imp18127b.c(45): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(49): Error: struct `S_bitfields_mismatch2` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(49): previously declared here
fail_compilation/imports/imp18127b.c(50): Field 0 differs in being a bitfield
fail_compilation/imports/imp18127b.c(50): `imp18127b.S_bitfields_mismatch2.x` *is a bitfield
fail_compilation/imports/imp18127a.c(50): `imp18127a.S_bitfields_mismatch2.x` is not a bitfield
fail_compilation/imports/imp18127b.c(49): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(54): Error: struct `S_bitfields_widths` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(54): previously declared here
fail_compilation/imports/imp18127b.c(56): Field 1 differs in bitfield width
fail_compilation/imports/imp18127b.c(56): `imp18127b.S_bitfields_widths.y`: 2
fail_compilation/imports/imp18127a.c(56): `imp18127a.S_bitfields_widths.y`: 1
fail_compilation/imports/imp18127b.c(54): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(59): Error: struct `S_bitfields_anon` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(59): previously declared here
fail_compilation/imports/imp18127b.c(61): Field 1 differs in name
fail_compilation/imports/imp18127b.c(61): y
fail_compilation/imports/imp18127a.c(61): (anonymous)
fail_compilation/imports/imp18127b.c(59): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(65): Error: struct `S_alignas` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(65): previously declared here
fail_compilation/imports/imp18127b.c(66): Field 0 differs in alignment or packing
fail_compilation/imports/imp18127b.c(66): `imp18127b.S_alignas.x` alignment: default
fail_compilation/imports/imp18127a.c(66): `imp18127a.S_alignas.x` alignment: 8
fail_compilation/imports/imp18127b.c(65): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(68): Error: struct `S_aligned` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(68): previously declared here
fail_compilation/imports/imp18127b.c(68): `imp18127b.S_aligned` has different alignment or packing
fail_compilation/imports/imp18127b.c(68): `imp18127b.S_aligned` alignment: 4
fail_compilation/imports/imp18127a.c(68): `imp18127a.S_aligned` alignment: 8
fail_compilation/imports/imp18127b.c(68): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(73): Error: struct `S_pack_1` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(73): previously declared here
fail_compilation/imports/imp18127b.c(73): `imp18127b.S_pack_1` has different alignment or packing
fail_compilation/imports/imp18127b.c(73): `imp18127b.S_pack_1` alignment: default
fail_compilation/imports/imp18127a.c(73): `imp18127a.S_pack_1` alignment: 1
fail_compilation/imports/imp18127b.c(73): `imp18127b.S_pack_1` packed: false
fail_compilation/imports/imp18127a.c(73): `imp18127a.S_pack_1` packed: true
fail_compilation/imports/imp18127b.c(73): C structs with the same name from different imports are merged
fail_compilation/imports/imp18127b.c(77): Error: struct `S_pack_2` already exists with an incompatible definition.
fail_compilation/imports/imp18127a.c(79): previously declared here
fail_compilation/imports/imp18127b.c(77): `imp18127b.S_pack_2` has different alignment or packing
fail_compilation/imports/imp18127b.c(77): `imp18127b.S_pack_2` alignment: default
fail_compilation/imports/imp18127a.c(79): `imp18127a.S_pack_2` alignment: 1
fail_compilation/imports/imp18127b.c(77): C structs with the same name from different imports are merged
---
*/
// https://github.com/dlang/dmd/issues/18127
import imports.imp18127a;
import imports.imp18127b;