Skip to content

Commit 186f49b

Browse files
committed
Maintain alignment annotation when extracting from already-typechecked
1 parent f5158cd commit 186f49b

File tree

3 files changed

+36
-0
lines changed

3 files changed

+36
-0
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#define STATIC_ASSERT(condition) \
2+
int some_array[(condition) ? 1 : -1];
3+
4+
#ifdef __GNUC__
5+
6+
struct s
7+
{
8+
char x;
9+
10+
// struct-typed member with alignment
11+
struct inner
12+
{
13+
int a;
14+
} inner __attribute__((aligned(64)));
15+
};
16+
17+
STATIC_ASSERT(sizeof(struct s)==128);
18+
19+
#endif
20+
21+
int main()
22+
{
23+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
CORE
2+
main.c
3+
4+
^EXIT=0$
5+
^SIGNAL=0$
6+
--
7+
^warning: ignoring
8+
^CONVERSION ERROR$

src/ansi-c/c_typecheck_type.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,14 @@ void c_typecheck_baset::typecheck_type(typet &type)
5151
c_qualifierst c_qualifiers(type);
5252
c_qualifiers+=c_qualifierst(type.subtype());
5353
bool packed=type.get_bool(ID_C_packed);
54+
exprt alignment=static_cast<const exprt &>(type.find(ID_C_alignment));
55+
5456
type.swap(type.subtype());
57+
5558
c_qualifiers.write(type);
5659
if(packed) type.set(ID_C_packed, true);
60+
if(alignment.is_not_nil()) type.add(ID_C_alignment, alignment);
61+
5762
return; // done
5863
}
5964

0 commit comments

Comments
 (0)