OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stor-layout.c (finish_bitfield_representative): Fall back to the conservative maximum size if... 

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.

From-SVN: r185464
This commit is contained in:
Richard Guenther 2012-03-16 11:47:26 +00:00 committed by Richard Biener
parent 86286a8a96
commit 2447776cc9
4 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
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.
2012-03-16 Tristan Gingold <gingold@adacore.com>
* config/vms/vms.h (TARGET_OS_CPP_BUILTINS): Define

18
gcc/stor-layout.c
View File

@ -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))

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2012-03-16 Richard Guenther <rguenther@suse.de>
* gnat.dg/specs/pack7.ads: New testcase.
2012-03-15 Jakub Jelinek <jakub@redhat.com>
PR target/52568

13
gcc/testsuite/gnat.dg/specs/pack7.ads Normal file
View File

@ -0,0 +1,13 @@
-- { dg-do compile }
package Pack7 is
type R (D : Natural) is record
S : String (1 .. D);
N : Natural;
B : Boolean;
end record;
for R'Alignment use 4;
pragma Pack (R);
end Pack7;