From 7800a8fb04adc60273185de201e9dff51b356952 Mon Sep 17 00:00:00 2001 From: Yannick Moy Date: Mon, 8 Jul 2019 08:13:52 +0000 Subject: [PATCH] [Ada] Do not erase precise type on fixed-point real literal Real literals of fixed-point type are expected to keep their precise fixed-point type in GNATprove. This is now correctly enforced. There is no impact on compilation. 2019-07-08 Yannick Moy gcc/ada/ * expander.adb (Expand): Do not reset Analyzed flag always. * sem_eval.adb (Fold_Ureal): Mark node as analyzed. From-SVN: r273211 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/expander.adb | 7 ++++++- gcc/ada/sem_eval.adb | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1650732e2d6..e278295432c 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2019-07-08 Yannick Moy + + * expander.adb (Expand): Do not reset Analyzed flag always. + * sem_eval.adb (Fold_Ureal): Mark node as analyzed. + 2019-07-08 Ed Schonberg * exp_ch9.adb (Expand_N_Timed_Entry_Call): Do not insert twice diff --git a/gcc/ada/expander.adb b/gcc/ada/expander.adb index 11711b95750..aac2e7deae5 100644 --- a/gcc/ada/expander.adb +++ b/gcc/ada/expander.adb @@ -112,7 +112,12 @@ package body Expander is Expand_SPARK (N); end if; - Set_Analyzed (N, Full_Analysis); + -- Do not reset the Analyzed flag if it has been set on purpose + -- during preanalysis. + + if Full_Analysis then + Set_Analyzed (N); + end if; -- Regular expansion is normally followed by special handling for -- transient scopes for unconstrained results, etc. but this is not diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb index 4956ef371ea..ff3359fb0e2 100644 --- a/gcc/ada/sem_eval.adb +++ b/gcc/ada/sem_eval.adb @@ -4611,10 +4611,14 @@ package body Sem_Eval is -- will cause semantic errors if it is marked as static), and after -- the Resolve step (since Resolve in some cases sets this flag). + -- We mark the node as analyzed so that its type is not erased by + -- calling Analyze_Real_Literal. + Analyze (N); Set_Is_Static_Expression (N, Static); Set_Etype (N, Typ); Resolve (N); + Set_Analyzed (N); Set_Is_Static_Expression (N, Static); end Fold_Ureal; -- 2.30.2