From 347dec125b662bdeb6d426ead3449e1209c2ce28 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 14 Jul 2022 01:25:25 +0200 Subject: [PATCH] [Ada] Adjust previous change to Expand_Subtype_From_Expr An aggregate may have been rewritten before being seen by the procedure. gcc/ada/ * exp_util.adb (Expand_Subtype_From_Expr): Be prepared for rewritten aggregates as expressions. --- gcc/ada/exp_util.adb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb index a8636bb..0a0ae93 100644 --- a/gcc/ada/exp_util.adb +++ b/gcc/ada/exp_util.adb @@ -5741,7 +5741,7 @@ package body Exp_Util is -- non-statically-matching subtypes on 'Access of this object. and then (Nkind (N) /= N_Object_Declaration - or else Nkind (Exp) = N_Aggregate + or else Nkind (Original_Node (Exp)) = N_Aggregate or else Is_Constr_Subt_For_U_Nominal (Exp_Typ)) then -- Within an initialization procedure, a selected component -- 2.7.4