From: Steve Baird <baird@adacore.com>
Date: Mon, 29 Aug 2022 21:55:14 +0000 (-0700)
Subject: [Ada] Syntax error in Ada 2022 array aggregate causes bug box
X-Git-Tag: basepoints/gcc-14~4610
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bde1fc68f4ed9699814342987adf22fcb91eaee;p=thirdparty%2Fgcc.git

[Ada] Syntax error in Ada 2022 array aggregate causes bug box

Check for the case where a user writes "in" instead of "of" in an
aggregate like "[for E in Some_Array when Some_Filter (E) => E]".

gcc/ada/

	* sem_aggr.adb
	(Resolve_Array_Aggregate): Generate an appropriate error message
	in the case where an error in the source code leads to an
	N_Iterated_Element_Association node in a bad context.
---

diff --git a/gcc/ada/sem_aggr.adb b/gcc/ada/sem_aggr.adb
index 258e4ad47b6a..5db1fce01b08 100644
--- a/gcc/ada/sem_aggr.adb
+++ b/gcc/ada/sem_aggr.adb
@@ -1987,6 +1987,11 @@ package body Sem_Aggr is
          while Present (Assoc) loop
             if Nkind (Assoc) = N_Iterated_Component_Association then
                Resolve_Iterated_Component_Association (Assoc, Index_Typ);
+
+            elsif Nkind (Assoc) /= N_Component_Association then
+               Error_Msg_N
+                 ("invalid component association for aggregate", Assoc);
+               return Failure;
             end if;
 
             Choice := First (Choice_List (Assoc));