diff options
| author | Arnaud Charlet <charlet@gcc.gnu.org> | 2004-12-08 12:26:20 +0100 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2004-12-08 12:26:20 +0100 |
| commit | 0da07eae29b486dcbd85cd85cc92fd20a10ca999 (patch) | |
| tree | 86e8b03a0b8b8a40bb0b8af7e1f70a28d75256c7 /gcc/ada/decl.c | |
| parent | a4c1cd80655ef876d7f8ff5944999492647ebab5 (diff) | |
| download | gcc-0da07eae29b486dcbd85cd85cc92fd20a10ca999.zip gcc-0da07eae29b486dcbd85cd85cc92fd20a10ca999.tar.gz gcc-0da07eae29b486dcbd85cd85cc92fd20a10ca999.tar.bz2 | |
decl.c (maybe_pad_type): Use TYPE_SIZE_UNIT of the input type for TYPE_SIZE_UNIT of result type if...
* decl.c (maybe_pad_type): Use TYPE_SIZE_UNIT of the input type for
TYPE_SIZE_UNIT of result type if SIZE is not specified.
(make_aligning_type): Pass -1 as ADDRESSABLE to prevent the creation
of a bitfield, which we know is useless and causes trouble because of
alignment implications.
* utils.c (create_var_decl): Set DECL_COMMON again on targets without
BSS sections.
(process_attributes): Clear DECL_COMMON again when a section attribute
is present.
(finish_record_type): Independently track if RECORD_TYPE has SIZE and/or
SIZE_UNIT already set and use to compute final SIZE and SIZE_UNIT.
(create_field_decl): Special case ADDRESSABLE negative to mean
"no bitfield creation", to be used by make_aligning_type. Don't
restrict bitfield creation to !ADDRESSABLE any more, as some BLKmode
fields claimed addressable still have to be bitfields. Use
value_factor_p instead of a raw binop construction to check for the
position's alignment.
From-SVN: r91879
Diffstat (limited to 'gcc/ada/decl.c')
| -rw-r--r-- | gcc/ada/decl.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/gcc/ada/decl.c b/gcc/ada/decl.c index d5c56b5..eebb7cb 100644 --- a/gcc/ada/decl.c +++ b/gcc/ada/decl.c @@ -4618,7 +4618,6 @@ make_aligning_type (tree type, int align, tree size) /* The bit position is obtained by "and"ing the alignment minus 1 with the two's complement of the address and multiplying by the number of bits per unit. Do all this in sizetype. */ - pos = size_binop (MULT_EXPR, convert (bitsizetype, size_binop (BIT_AND_EXPR, @@ -4628,9 +4627,13 @@ make_aligning_type (tree type, int align, tree size) - 1))), bitsize_unit_node); - field = create_field_decl (get_identifier ("F"), type, record_type, - 1, size, pos, 1); - DECL_BIT_FIELD (field) = 0; + /* Create the field, with -1 as the 'addressable' indication to avoid the + creation of a bitfield. We don't need one, it would have damaging + consequences on the alignment computation, and create_field_decl would + make one without this special argument, for instance because of the + complex position expression. */ + field = create_field_decl (get_identifier ("F"), type, record_type, 1, size, + pos, -1); finish_record_type (record_type, field, true, false); TYPE_ALIGN (record_type) = BIGGEST_ALIGNMENT; @@ -4822,9 +4825,10 @@ maybe_pad_type (tree type, tree size, unsigned int align, DECL_INTERNAL_P (field) = 1; TYPE_SIZE (record) = size ? size : orig_size; TYPE_SIZE_UNIT (record) - = convert (sizetype, - size_binop (CEIL_DIV_EXPR, TYPE_SIZE (record), - bitsize_unit_node)); + = (size ? convert (sizetype, + size_binop (CEIL_DIV_EXPR, size, bitsize_unit_node)) + : TYPE_SIZE_UNIT (type)); + TYPE_ALIGN (record) = align; TYPE_IS_PADDING_P (record) = 1; TYPE_VOLATILE (record) |