public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-6349] [Ada] Check scalar range in arrays constructed by concatenation
@ 2022-01-07 16:27 Pierre-Marie de Rodat
0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2022-01-07 16:27 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:34b8a9b8c094a43566fe4fbe0f9252dcd4d92e70
commit r12-6349-g34b8a9b8c094a43566fe4fbe0f9252dcd4d92e70
Author: Etienne Servais <servais@adacore.com>
Date: Tue Nov 30 17:47:52 2021 +0100
[Ada] Check scalar range in arrays constructed by concatenation
gcc/ada/
* sem_res.adb (Resolve_Op_Concat_Arg): Check range when
concatenating scalars.
Diff:
---
gcc/ada/sem_res.adb | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index 44b041431c8..d05da0d8dcc 100644
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -10185,7 +10185,7 @@ package body Sem_Res is
("\\interpretation as call yields&", Arg, Typ);
Error_Msg_NE
("\\interpretation as indexing of call yields&",
- Arg, Component_Type (Typ));
+ Arg, Ctyp);
else
Error_Msg_N ("ambiguous operand for concatenation!", Arg);
@@ -10208,10 +10208,30 @@ package body Sem_Res is
end;
end if;
- Resolve (Arg, Component_Type (Typ));
+ Resolve (Arg, Ctyp);
if Nkind (Arg) = N_String_Literal then
- Set_Etype (Arg, Component_Type (Typ));
+ Set_Etype (Arg, Ctyp);
+
+ elsif Is_Scalar_Type (Etype (Arg))
+ and then Compile_Time_Known_Value (Arg)
+ then
+ -- Determine if the out-of-range violation constitutes a
+ -- warning or an error according to the expression base type,
+ -- according to Ada 2022 RM 4.9 (35/2).
+
+ if Is_Out_Of_Range (Arg, Base_Type (Ctyp)) then
+ Apply_Compile_Time_Constraint_Error
+ (Arg, "value not in range of}", CE_Range_Check_Failed,
+ Ent => Base_Type (Ctyp),
+ Typ => Base_Type (Ctyp));
+
+ elsif Is_Out_Of_Range (Arg, Ctyp) then
+ Apply_Compile_Time_Constraint_Error
+ (Arg, "value not in range of}??", CE_Range_Check_Failed,
+ Ent => Ctyp,
+ Typ => Ctyp);
+ end if;
end if;
if Arg = Left_Opnd (N) then
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-01-07 16:27 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-07 16:27 [gcc r12-6349] [Ada] Check scalar range in arrays constructed by concatenation 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).