public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-4551] [Ada] Fix problematic conversion of real literal in static context
@ 2021-10-20 10:19 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2021-10-20 10:19 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:723d09e8895733f065200fa1b54c84243cf96f69
commit r12-4551-g723d09e8895733f065200fa1b54c84243cf96f69
Author: Eric Botcazou <ebotcazou@adacore.com>
Date: Thu Oct 14 15:44:48 2021 +0200
[Ada] Fix problematic conversion of real literal in static context
gcc/ada/
* sem_eval.adb (Eval_Type_Conversion): If the target subtype is
a static floating-point subtype and the result is a real literal,
consider its machine-rounded value to raise Constraint_Error.
(Test_In_Range): Turn local variables into constants.
Diff:
---
gcc/ada/sem_eval.adb | 35 +++++++++++++++++++++++------------
1 file changed, 23 insertions(+), 12 deletions(-)
diff --git a/gcc/ada/sem_eval.adb b/gcc/ada/sem_eval.adb
index e3308efbf25..7270172dce9 100644
--- a/gcc/ada/sem_eval.adb
+++ b/gcc/ada/sem_eval.adb
@@ -4352,7 +4352,25 @@ package body Sem_Eval is
Fold_Uint (N, Expr_Value (Operand), Stat);
end if;
- if Is_Out_Of_Range (N, Etype (N), Assume_Valid => True) then
+ -- If the target is a static floating-point subtype, then its bounds
+ -- are machine numbers so we must consider the machine-rounded value.
+
+ if Is_Floating_Point_Type (Target_Type)
+ and then Nkind (N) = N_Real_Literal
+ and then not Is_Machine_Number (N)
+ then
+ declare
+ Lo : constant Node_Id := Type_Low_Bound (Target_Type);
+ Hi : constant Node_Id := Type_High_Bound (Target_Type);
+ Valr : constant Ureal :=
+ Machine_Number (Target_Type, Expr_Value_R (N), N);
+ begin
+ if Valr < Expr_Value_R (Lo) or else Valr > Expr_Value_R (Hi) then
+ Out_Of_Range (N);
+ end if;
+ end;
+
+ elsif Is_Out_Of_Range (N, Etype (N), Assume_Valid => True) then
Out_Of_Range (N);
end if;
end Eval_Type_Conversion;
@@ -7342,19 +7360,12 @@ package body Sem_Eval is
elsif Compile_Time_Known_Value (N) then
declare
- Lo : Node_Id;
- Hi : Node_Id;
-
- LB_Known : Boolean;
- HB_Known : Boolean;
+ Lo : constant Node_Id := Type_Low_Bound (Typ);
+ Hi : constant Node_Id := Type_High_Bound (Typ);
+ LB_Known : constant Boolean := Compile_Time_Known_Value (Lo);
+ HB_Known : constant Boolean := Compile_Time_Known_Value (Hi);
begin
- Lo := Type_Low_Bound (Typ);
- Hi := Type_High_Bound (Typ);
-
- LB_Known := Compile_Time_Known_Value (Lo);
- HB_Known := Compile_Time_Known_Value (Hi);
-
-- Fixed point types should be considered as such only if flag
-- Fixed_Int is set to False.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-10-20 10:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-20 10:19 [gcc r12-4551] [Ada] Fix problematic conversion of real literal in static context Pierre-Marie de Rodat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).