From 25d744bb6cf7e3b9a91930caff9f88814f2c36ca Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 10 Dec 2019 11:20:06 +0100 Subject: [PATCH] [Ada] Do not set the bounds of integer types to be universal 2020-06-02 Eric Botcazou gcc/ada/ * sem_ch3.adb (Signed_Integer_Type_Declaration): Change the type of the bounds from Universal_Integer to Implicit_Base. --- gcc/ada/sem_ch3.adb | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index f965e8ca6cf..e792072b45f 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -22550,18 +22550,10 @@ package body Sem_Ch3 is ("non-static expression used for integer type bound!", Expr); Errs := True; - -- The bounds are folded into literals, and we set their type to be - -- universal, to avoid typing difficulties: we cannot set the type - -- of the literal to the new type, because this would be a forward - -- reference for the back end, and if the original type is user- - -- defined this can lead to spurious semantic errors (e.g. 2928-003). + -- Otherwise the bounds are folded into literals - else - if Is_Entity_Name (Expr) then - Fold_Uint (Expr, Expr_Value (Expr), True); - end if; - - Set_Etype (Expr, Universal_Integer); + elsif Is_Entity_Name (Expr) then + Fold_Uint (Expr, Expr_Value (Expr), True); end if; end Check_Bound; @@ -22583,6 +22575,7 @@ package body Sem_Ch3 is if Hi = Error or else Lo = Error then Base_Typ := Any_Integer; Set_Error_Posted (T, True); + Errs := True; -- Here both bounds are OK expressions @@ -22627,6 +22620,17 @@ package body Sem_Ch3 is end if; end if; + -- Set the type of the bounds to the implicit base: we cannot set it to + -- the new type, because this would be a forward reference for the code + -- generator and, if the original type is user-defined, this could even + -- lead to spurious semantic errors. Furthermore we do not set it to be + -- universal, because this could make it much larger than needed here. + + if not Errs then + Set_Etype (Lo, Implicit_Base); + Set_Etype (Hi, Implicit_Base); + end if; + -- Complete both implicit base and declared first subtype entities. The -- inheritance of the rep item chain ensures that SPARK-related pragmas -- are not clobbered when the signed integer type acts as a full view of -- 2.30.2