decl.c (components_to_record): Adjust the packedness for the qualified union as well.
* decl.c (components_to_record): Adjust the packedness for the qualified union as well. From-SVN: r136583
This commit is contained in:
parent
2c2b17103d
commit
912cb4420d
|
@ -1,3 +1,8 @@
|
|||
2008-06-09 Eric Botcazou <ebotcazou@adacore.com>
|
||||
|
||||
* decl.c (components_to_record): Adjust the packedness for the
|
||||
qualified union as well.
|
||||
|
||||
2008-06-09 Arnaud Charlet <charlet@adacore.com>
|
||||
|
||||
* Make-lang.in: Use -gnatwns instead of -gnatws to make sytyle
|
||||
|
|
|
@ -6461,6 +6461,8 @@ components_to_record (tree gnu_record_type, Node_Id component_list,
|
|||
/* Only make the QUAL_UNION_TYPE if there are any non-empty variants. */
|
||||
if (gnu_variant_list)
|
||||
{
|
||||
int union_field_packed;
|
||||
|
||||
if (all_rep_and_size)
|
||||
{
|
||||
TYPE_SIZE (gnu_union_type) = TYPE_SIZE (gnu_record_type);
|
||||
|
@ -6482,9 +6484,13 @@ components_to_record (tree gnu_record_type, Node_Id component_list,
|
|||
return;
|
||||
}
|
||||
|
||||
/* Deal with packedness like in gnat_to_gnu_field. */
|
||||
union_field_packed
|
||||
= adjust_packed (gnu_union_type, gnu_record_type, packed);
|
||||
|
||||
gnu_union_field
|
||||
= create_field_decl (gnu_var_name, gnu_union_type, gnu_record_type,
|
||||
packed,
|
||||
union_field_packed,
|
||||
all_rep ? TYPE_SIZE (gnu_union_type) : 0,
|
||||
all_rep ? bitsize_zero_node : 0, 0);
|
||||
|
||||
|
|
|
@ -1,3 +1,8 @@
|
|||
2008-06-09 Eric Botcazou <ebotcazou@adacore.com>
|
||||
|
||||
* gnat.dg/specs/pack3.ads: New test.
|
||||
* gnat.dg/specs/pack3_pkg.ads: New helper.
|
||||
|
||||
2008-06-08 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
PR c++/35242
|
||||
|
|
|
@ -0,0 +1,45 @@
|
|||
-- { dg-do compile }
|
||||
|
||||
with Pack3_Pkg;
|
||||
|
||||
package Pack3 is
|
||||
|
||||
subtype N_TYPE is INTEGER range 0..5;
|
||||
|
||||
type LIST_ARRAY is array (N_TYPE range <>) of INTEGER;
|
||||
|
||||
type LIST (N : N_TYPE := 0) is record
|
||||
LIST : LIST_ARRAY(1..N);
|
||||
end record;
|
||||
pragma PACK(LIST);
|
||||
|
||||
subtype CS is STRING(1..Pack3_Pkg.F);
|
||||
|
||||
type CSA is array (NATURAL range <>) of CS;
|
||||
|
||||
type REC is record
|
||||
I1, I2 : INTEGER;
|
||||
end record ;
|
||||
|
||||
type CMD is (CO, AS);
|
||||
|
||||
type CMD_BLOCK_TYPE (D : CMD := CO) is record
|
||||
N : CSA (1..4);
|
||||
case D is
|
||||
when CO => L : LIST;
|
||||
when AS => R : REC;
|
||||
end case ;
|
||||
end record;
|
||||
pragma PACK(CMD_BLOCK_TYPE);
|
||||
|
||||
type CMD_TYPE is (RIGHT, WRONG);
|
||||
|
||||
type CMD_RESULT (D : CMD_TYPE) is record
|
||||
case D is
|
||||
when RIGHT => C : CMD_BLOCK_TYPE;
|
||||
when WRONG => null;
|
||||
end case;
|
||||
end record ;
|
||||
pragma PACK(CMD_RESULT);
|
||||
|
||||
end Pack3;
|
|
@ -0,0 +1,7 @@
|
|||
-- { dg-excess-errors "no code generated" }
|
||||
|
||||
package Pack3_Pkg is
|
||||
|
||||
function F return Integer;
|
||||
|
||||
end Pack3_Pkg;
|
Loading…
Reference in New Issue