freeze.adb (Freeze_Array_Type): Apply same handling to Is_Atomic component type as to Has_Atomic_Components type.

2015-01-07  Eric Botcazou  <ebotcazou@adacore.com>

	* freeze.adb (Freeze_Array_Type): Apply same handling to Is_Atomic
	component type as to Has_Atomic_Components type.  Remove useless
	test on Is_Aliased component type.

From-SVN: r219281
This commit is contained in:
Eric Botcazou 2015-01-07 08:45:17 +00:00 committed by Arnaud Charlet
parent 8636f52f7b
commit 7806a9ed84
2 changed files with 12 additions and 9 deletions

View File

@ -1,3 +1,9 @@
2015-01-07 Eric Botcazou <ebotcazou@adacore.com>
* freeze.adb (Freeze_Array_Type): Apply same handling to Is_Atomic
component type as to Has_Atomic_Components type. Remove useless
test on Is_Aliased component type.
2015-01-07 Hristian Kirtchev <kirtchev@adacore.com>
* alloc.ads Alphabetize several declarations. Add constants

View File

@ -2431,12 +2431,12 @@ package body Freeze is
end if;
end;
-- Check for Atomic_Components or Aliased with unsuitable packing
-- or explicit component size clause given.
-- Check for Aliased or Atomic_Components/Atomic with unsuitable
-- packing or explicit component size clause given.
if (Has_Atomic_Components (Arr)
if (Has_Aliased_Components (Arr)
or else
Has_Aliased_Components (Arr))
Has_Atomic_Components (Arr) or else Is_Atomic (Ctyp))
and then
(Has_Component_Size_Clause (Arr) or else Is_Packed (Arr))
then
@ -2503,13 +2503,10 @@ package body Freeze is
then
null;
elsif Has_Aliased_Components (Arr)
or else Is_Aliased (Ctyp)
then
elsif Has_Aliased_Components (Arr) then
Complain_CS ("aliased");
elsif Has_Atomic_Components (Arr)
or else Is_Atomic (Ctyp)
elsif Has_Atomic_Components (Arr) or else Is_Atomic (Ctyp)
then
Complain_CS ("atomic");
end if;