diff options
| author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-16 11:47:26 +0000 |
|---|---|---|
| committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-16 11:47:26 +0000 |
| commit | 75188dc68c81ef5bfbaa26384489689a8c208e35 (patch) | |
| tree | 12f156b2aa3208d9537ce80c5796aaa8041091a4 /gcc/stor-layout.c | |
| parent | 46da3ce5804b76e4cc2713702f5cbfe14cd175c3 (diff) | |
| download | gcc-75188dc68c81ef5bfbaa26384489689a8c208e35.tar.gz | |
2012-03-16 Richard Guenther <rguenther@suse.de>
* stor-layout.c (finish_bitfield_representative): Fall back
to the conservative maximum size if we cannot compute the
size of the tail padding.
* gnat.dg/specs/pack7.ads: New testcase.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185464 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/stor-layout.c')
| -rw-r--r-- | gcc/stor-layout.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index 7c7fabc6bed..98b78865d4d 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -1765,6 +1765,9 @@ finish_bitfield_representative (tree repr, tree field) - tree_low_cst (DECL_FIELD_BIT_OFFSET (repr), 1) + tree_low_cst (DECL_SIZE (field), 1)); + /* Round up bitsize to multiples of BITS_PER_UNIT. */ + bitsize = (bitsize + BITS_PER_UNIT - 1) & ~(BITS_PER_UNIT - 1); + /* Now nothing tells us how to pad out bitsize ... */ nextf = DECL_CHAIN (field); while (nextf && TREE_CODE (nextf) != FIELD_DECL) @@ -1787,12 +1790,16 @@ finish_bitfield_representative (tree repr, tree field) { /* ??? If you consider that tail-padding of this struct might be re-used when deriving from it we cannot really do the following - and thus need to set maxsize to bitsize? */ + and thus need to set maxsize to bitsize? Also we cannot + generally rely on maxsize to fold to an integer constant, so + use bitsize as fallback for this case. */ tree maxsize = size_diffop (TYPE_SIZE_UNIT (DECL_CONTEXT (field)), DECL_FIELD_OFFSET (repr)); - gcc_assert (host_integerp (maxsize, 1)); - maxbitsize = (tree_low_cst (maxsize, 1) * BITS_PER_UNIT - - tree_low_cst (DECL_FIELD_BIT_OFFSET (repr), 1)); + if (host_integerp (maxsize, 1)) + maxbitsize = (tree_low_cst (maxsize, 1) * BITS_PER_UNIT + - tree_low_cst (DECL_FIELD_BIT_OFFSET (repr), 1)); + else + maxbitsize = bitsize; } /* Only if we don't artificially break up the representative in @@ -1801,9 +1808,6 @@ finish_bitfield_representative (tree repr, tree field) at byte offset. */ gcc_assert (maxbitsize % BITS_PER_UNIT == 0); - /* Round up bitsize to multiples of BITS_PER_UNIT. */ - bitsize = (bitsize + BITS_PER_UNIT - 1) & ~(BITS_PER_UNIT - 1); - /* Find the smallest nice mode to use. */ for (mode = GET_CLASS_NARROWEST_MODE (MODE_INT); mode != VOIDmode; mode = GET_MODE_WIDER_MODE (mode)) |