diff options
| author | Etienne Servais <servais@adacore.com> | 2021-11-30 17:47:52 +0100 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2022-01-07 16:24:06 +0000 |
| commit | 34b8a9b8c094a43566fe4fbe0f9252dcd4d92e70 (patch) | |
| tree | 1371b8f3c466456ffb2aefb4e9d11f4d6e086974 | |
| parent | b2f150304dc18af2f6b11005a140339f170d6fc2 (diff) | |
| download | gcc-34b8a9b8c094a43566fe4fbe0f9252dcd4d92e70.zip gcc-34b8a9b8c094a43566fe4fbe0f9252dcd4d92e70.tar.gz gcc-34b8a9b8c094a43566fe4fbe0f9252dcd4d92e70.tar.bz2 | |
[Ada] Check scalar range in arrays constructed by concatenation
gcc/ada/
* sem_res.adb (Resolve_Op_Concat_Arg): Check range when
concatenating scalars.
| -rw-r--r-- | gcc/ada/sem_res.adb | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb index 44b0414..d05da0d 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 |