From: Ed Schonberg <schonberg@adacore.com>
Date: Wed, 30 Jun 2021 22:11:11 +0000 (-0400)
Subject: [Ada] Refine patch for spurious link error involving discriminated types
X-Git-Tag: basepoints/gcc-13~4585
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c36332031cff305ceb0d1924ee4b2cedbd85023a;p=thirdparty%2Fgcc.git

[Ada] Refine patch for spurious link error involving discriminated types

gcc/ada/

	* sem_ch3.adb (Process_Discriminant_Expressions): If the
	constraint is for a Component_Definition that appears in a
	Component_Declaration, the entity to be used to create the
	potentially global symbol is the Defining_Identifier of the
	Component_Declaration.
---

diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 6a938706968a..b233c563a2dd 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -10502,13 +10502,30 @@ package body Sem_Ch3 is
                if Expander_Active
                  and then Comes_From_Source (Def)
                  and then not Is_Subprogram (Current_Scope)
-                 and then Nkind (Parent (Def)) in
-                   N_Object_Declaration | N_Component_Declaration
                then
-                  Force_Evaluation (
-                    Discr_Expr (J),
-                    Related_Id => Defining_Identifier (Parent (Def)),
-                    Discr_Number => J);
+                  declare
+                     Id : Entity_Id := Empty;
+                  begin
+                     if Nkind (Parent (Def)) = N_Object_Declaration then
+                        Id := Defining_Identifier (Parent (Def));
+
+                     elsif Nkind (Parent (Def)) = N_Component_Definition
+                       and then
+                         Nkind (Parent (Parent (Def)))
+                            = N_Component_Declaration
+                     then
+                        Id := Defining_Identifier (Parent (Parent (Def)));
+                     end if;
+
+                     if Present (Id) then
+                        Force_Evaluation (
+                          Discr_Expr (J),
+                          Related_Id => Id,
+                          Discr_Number => J);
+                     else
+                        Force_Evaluation (Discr_Expr (J));
+                     end if;
+                  end;
                else
                   Force_Evaluation (Discr_Expr (J));
                end if;