mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-21 14:30:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

decl.c (gnat_to_gnu_component_type): Force at least unit size for the component size of an array with aliased components.

Browse Source 
* gcc-interface/decl.c (gnat_to_gnu_component_type): Force at least
	unit size for the component size of an array with aliased components.
	(maybe_pad_type): Do not warn for MAX_EXPR.

From-SVN: r152417
This commit is contained in:
Eric Botcazou 2009-10-02 20:03:16 +00:00 committed by Eric Botcazou
parent 9e51149de6
commit 1aa8b1dd13
5 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ada/ChangeLog
View File

@ -1,3 +1,9 @@
2009-10-02 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/decl.c (gnat_to_gnu_component_type): Force at least
unit size for the component size of an array with aliased components.
(maybe_pad_type): Do not warn for MAX_EXPR.
2009-09-29 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/decl.c (gnat_to_gnu_entity) <E_Array_Type>: Factor out

12
gcc/ada/gcc-interface/decl.c
View File

@ -4990,6 +4990,17 @@ gnat_to_gnu_component_type (Entity_Id gnat_array, bool definition,
Is_Bit_Packed_Array (gnat_array) ? TYPE_DECL : VAR_DECL,
true, Has_Component_Size_Clause (gnat_array));
/* If the array has aliased components and the component size can be zero,
force at least unit size to ensure that the components have distinct
addresses. */
if (!gnu_comp_size
&& Has_Aliased_Components (gnat_array)
&& (integer_zerop (TYPE_SIZE (gnu_type))
|| (TREE_CODE (gnu_type) == ARRAY_TYPE
&& !TREE_CONSTANT (TYPE_SIZE (gnu_type)))))
gnu_comp_size
= size_binop (MAX_EXPR, TYPE_SIZE (gnu_type), bitsize_unit_node);
/* If the component type is a RECORD_TYPE that has a self-referential size,
then use the maximum size for the component size. */
if (!gnu_comp_size
@ -6210,6 +6221,7 @@ maybe_pad_type (tree type, tree size, unsigned int align,
if (Present (gnat_entity)
&& size
&& TREE_CODE (size) != MAX_EXPR
&& !operand_equal_p (size, orig_size, 0)
&& !(TREE_CODE (size) == INTEGER_CST
&& TREE_CODE (orig_size) == INTEGER_CST

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2009-10-02 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/array11.adb: New test.
* gnat.dg/array12.adb: Likewise.
2009-10-02 Eric Botcazou <ebotcazou@adacore.com>
* gnat.dg/array10.adb: New test.

16
gcc/testsuite/gnat.dg/array11.adb Normal file
View File

@ -0,0 +1,16 @@
-- { dg-do compile }
procedure Array11 is
type Rec is null record;
type Ptr is access all Rec;
type Arr1 is array (1..8) of aliased Rec; -- { dg-warning "padded" }
type Arr2 is array (Long_Integer) of aliased Rec; -- { dg-warning "padded" }
A1 : Arr1;
A2 : Arr2; -- { dg-warning "Storage_Error will be raised" }
begin
null;
end;

20
gcc/testsuite/gnat.dg/array12.adb Normal file
View File

@ -0,0 +1,20 @@
-- { dg-do run }
procedure Array12 is
function N return Integer is
begin
return 0;
end;
subtype Element is String (1 .. N);
type Ptr is access all Element;
type Vector is array (Positive range <>) of aliased Element;
V : Vector (1..2);
begin
if Ptr'(V(1)'Access) = V(2)'Access then
raise Program_Error;
end if;
end;