[Ada] Do not set the bounds of integer types to be universal

Message ID 20200602085938.GA119784@adacore.com
State New
Headers show
Series
  • [Ada] Do not set the bounds of integer types to be universal
Related show

Commit Message

Pierre-Marie de Rodat June 2, 2020, 8:59 a.m.
This changes the type set on the bounds of signed integer types declared
by the programmer: instead of Universal_Integer, it is set to the
anonymous base type created by the declaration.

The reason is that Universal_Integer must be a type as large as the
largest supported integer type and, therefore, can be much larger than
what is really needed here.

No functional changes.

Tested on x86_64-pc-linux-gnu, committed on trunk

2020-06-02  Eric Botcazou  <ebotcazou@adacore.com>

gcc/ada/

	* sem_ch3.adb (Signed_Integer_Type_Declaration): Change the type
	of the bounds from Universal_Integer to Implicit_Base.

Patch

--- gcc/ada/sem_ch3.adb
+++ 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