From: Javier Miranda <miranda@adacore.com>
Date: Thu, 6 Feb 2025 09:40:57 +0000 (+0000)
Subject: ada: Spurious compilation error with repeated loop index
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ece6a808254ca1653872cc2ca64a72e91d19731;p=thirdparty%2Fgcc.git

ada: Spurious compilation error with repeated loop index

When multiple for-loop statements in the same scope use the
same index name to iterate through container elements, the
compiler reports a spurious error indicating a conflict
between index names.

gcc/ada/ChangeLog:

	* exp_ch7.adb (Process_Object_Declaration): Avoid generating
	duplicate names for master nodes.
---

diff --git a/gcc/ada/exp_ch7.adb b/gcc/ada/exp_ch7.adb
index 67af1d77263..905094c7e40 100644
--- a/gcc/ada/exp_ch7.adb
+++ b/gcc/ada/exp_ch7.adb
@@ -2783,16 +2783,31 @@ package body Exp_Ch7 is
             Master_Node_Id :=
               Make_Defining_Identifier (Master_Node_Loc,
                 Chars => New_External_Name (Chars (Obj_Id), Suffix => "MN"));
+
             Master_Node_Decl :=
               Make_Master_Node_Declaration (Master_Node_Loc,
                 Master_Node_Id, Obj_Id);
 
             Push_Scope (Scope (Obj_Id));
+
+            --  Avoid generating duplicate names for master nodes
+
+            if Ekind (Obj_Id) = E_Loop_Parameter
+              and then
+                Present (Current_Entity_In_Scope (Chars (Master_Node_Id)))
+            then
+               Set_Chars (Master_Node_Id,
+                 New_External_Name (Chars (Obj_Id),
+                   Suffix => "MN",
+                   Suffix_Index => -1));
+            end if;
+
             if not Has_Strict_Ctrl_Objs or else Count = 1 then
                Prepend_To (Decls, Master_Node_Decl);
             else
                Insert_Before (Decl, Master_Node_Decl);
             end if;
+
             Analyze (Master_Node_Decl);
             Pop_Scope;