From: Piotr Trojanek <trojanek@adacore.com>
Date: Thu, 14 Jan 2021 16:28:31 +0000 (+0100)
Subject: [Ada] Fix expansion of attributes Input/Output for unchecked union types
X-Git-Tag: basepoints/gcc-13~7806
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d24ef4e60998f7f9f4fde52896af3afa42ec246c;p=thirdparty%2Fgcc.git

[Ada] Fix expansion of attributes Input/Output for unchecked union types

gcc/ada/

	* exp_attr.adb (Expand_N_Attribute_Reference): Fix expansion of
	attributes Input and Output for unchecked unions.
	* sem_case.ads: Fix typo "disriminant" and refill comment.
---

diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb
index 6c8abed44113..1775904a46bd 100644
--- a/gcc/ada/exp_attr.adb
+++ b/gcc/ada/exp_attr.adb
@@ -4237,12 +4237,13 @@ package body Exp_Attr is
                --  type if the type lacks default discriminant values.
 
                if Is_Unchecked_Union (Base_Type (U_Type))
-                 and then No (Discriminant_Constraint (U_Type))
+                 and then
+                 No (Discriminant_Default_Value (First_Discriminant (U_Type)))
                then
-                  Insert_Action (N,
+                  Rewrite (N,
                     Make_Raise_Program_Error (Loc,
                       Reason => PE_Unchecked_Union_Restriction));
-
+                  Set_Etype (N, B_Type);
                   return;
                end if;
 
@@ -5332,12 +5333,13 @@ package body Exp_Attr is
                --  values.
 
                if Is_Unchecked_Union (Base_Type (U_Type))
-                 and then No (Discriminant_Constraint (U_Type))
+                 and then
+                 No (Discriminant_Default_Value (First_Discriminant (U_Type)))
                then
-                  Insert_Action (N,
+                  Rewrite (N,
                     Make_Raise_Program_Error (Loc,
                       Reason => PE_Unchecked_Union_Restriction));
-
+                  Set_Etype (N, Standard_Void_Type);
                   return;
                end if;
 
diff --git a/gcc/ada/sem_case.ads b/gcc/ada/sem_case.ads
index f939eb26915b..00b7dd3fcd0d 100644
--- a/gcc/ada/sem_case.ads
+++ b/gcc/ada/sem_case.ads
@@ -44,8 +44,8 @@
 --    till the freeze point in this case.
 
 --    3. Set the Others_Discrete_Choices list for an others choice. This is
---    used in various ways, e.g. to construct the disriminant checking function
---    for the case of a variant with an others choice.
+--    used in various ways, e.g. to construct the discriminant checking
+--    function for the case of a variant with an others choice.
 
 --    4. In the case of static predicates, we need to expand out choices that
 --    correspond to the predicate for the back end. This expansion destroys