From: Arnaud Charlet <charlet@adacore.com>
Date: Fri, 5 Mar 2021 15:11:57 +0000 (-0500)
Subject: [Ada] Crash on a nested aggregate containing controlled objects
X-Git-Tag: upstream/12.2.0~7105
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4d46ee9a15b83552134476e9c0f691df1bfa123;p=platform%2Fupstream%2Fgcc.git

[Ada] Crash on a nested aggregate containing controlled objects

gcc/ada/

	* exp_util.adb (Find_Hook_Context): Do not stop on an aggregate
	node.
---

diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index c2cdb4c..71052c0 100644
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -6220,6 +6220,9 @@ package body Exp_Util is
                                         | N_Discriminant_Association
                                         | N_Parameter_Association
                                         | N_Pragma_Argument_Association
+                                        | N_Aggregate
+                                        | N_Delta_Aggregate
+                                        | N_Extension_Aggregate
               and then Nkind (Parent (Par)) not in N_Function_Call
                                                  | N_Procedure_Call_Statement
                                                  | N_Entry_Call_Statement