diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-10-10 17:51:14 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2014-10-10 17:51:14 +0000 |
| commit | f075f6ab1d0c5e8f435a37afc942e08cb445d9d9 (patch) | |
| tree | 37e22ae2dd6fe1c9ab9b543d21c4e6ce4a80fa94 /gcc/c-family/c-common.c | |
| parent | 4bb6404003436744059c0827d37d6d4e7d232f13 (diff) | |
PR c/63495
* c-common.c (min_align_of_type): Don't decrease alignment
through BIGGEST_FIELD_ALIGNMENT or ADJUST_FIELD_ALIGN if
TYPE_USER_ALIGN is set.
* gcc.target/i386/pr63495.c: New test.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@216102 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/c-family/c-common.c')
| -rw-r--r-- | gcc/c-family/c-common.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index f3c0dea234a..487fb4ee277 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -4934,16 +4934,18 @@ min_align_of_type (tree type) { unsigned int align = TYPE_ALIGN (type); align = MIN (align, BIGGEST_ALIGNMENT); + if (!TYPE_USER_ALIGN (type)) + { #ifdef BIGGEST_FIELD_ALIGNMENT - align = MIN (align, BIGGEST_FIELD_ALIGNMENT); + align = MIN (align, BIGGEST_FIELD_ALIGNMENT); #endif - unsigned int field_align = align; + unsigned int field_align = align; #ifdef ADJUST_FIELD_ALIGN - tree field = build_decl (UNKNOWN_LOCATION, FIELD_DECL, NULL_TREE, - type); - field_align = ADJUST_FIELD_ALIGN (field, field_align); + tree field = build_decl (UNKNOWN_LOCATION, FIELD_DECL, NULL_TREE, type); + field_align = ADJUST_FIELD_ALIGN (field, field_align); #endif - align = MIN (align, field_align); + align = MIN (align, field_align); + } return align / BITS_PER_UNIT; } |