aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2020-04-07 09:39:06 +0200
committerPierre-Marie de Rodat <derodat@adacore.com>2020-06-16 09:07:15 -0400
commit7e7cb6eee494e3ec59ae1faf679fe2c3a578a95e (patch)
tree15a78d2451af5a90b8fac7910f6363408ccb3304
parent158b52c9616a3bc0b1c2622e3627a544318fd329 (diff)
downloadgcc-7e7cb6eee494e3ec59ae1faf679fe2c3a578a95e.zip
gcc-7e7cb6eee494e3ec59ae1faf679fe2c3a578a95e.tar.gz
gcc-7e7cb6eee494e3ec59ae1faf679fe2c3a578a95e.tar.bz2
[Ada] Fix premature freezing of artificial array subtype
2020-06-16 Eric Botcazou <ebotcazou@adacore.com> 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.
-rw-r--r--gcc/ada/freeze.adb21
1 files changed, 12 insertions, 9 deletions
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index 8723af3..47a063a 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));