From 7e7cb6eee494e3ec59ae1faf679fe2c3a578a95e Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 7 Apr 2020 09:39:06 +0200 Subject: [PATCH] [Ada] Fix premature freezing of artificial array subtype 2020-06-16 Eric Botcazou gcc/ada/ * freeze.adb (Freeze_Expression): Stop climbing the parent chain at a N_{Case,If}_Expression node for a type or an entity that does not come from source. --- gcc/ada/freeze.adb | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index 8723af33edf..47a063ae043 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -7630,15 +7630,18 @@ package body Freeze is exit; end if; - -- Note: N_Loop_Statement is a special case. A type that - -- appears in the source can never be frozen in a loop (this - -- occurs only because of a loop expanded by the expander), so - -- we keep on going. Otherwise we terminate the search. Same - -- is true of any entity which comes from source. (if they - -- have predefined type, that type does not appear to come - -- from source, but the entity should not be frozen here). - - when N_Loop_Statement => + -- N_Loop_Statement is a special case: a type that appears in + -- the source can never be frozen in a loop (this occurs only + -- because of a loop expanded by the expander), so we keep on + -- going. Otherwise we terminate the search. Same is true of + -- any entity which comes from source (if it has a predefined + -- type, this type does not appear to come from source, but the + -- entity should not be frozen here). The reasoning can also be + -- applied to if-expressions and case-expressions. + + when N_Loop_Statement + | N_If_Expression + | N_Case_Expression => exit when not Comes_From_Source (Etype (N)) and then (No (Nam) or else not Comes_From_Source (Nam)); -- 2.30.2