diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-19 12:59:27 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-04-19 12:59:27 +0000 |
| commit | 6018aae3d2356cefd4c2d529276e712fcd0eeb9d (patch) | |
| tree | a83fb2e298eb4d43738609e6f7a59356edfce6ec /gcc/ada/exp_fixd.adb | |
| parent | 410a40a99b316ae3b8b612bfc6efa8568ea9b9d1 (diff) | |
| download | gcc-6018aae3d2356cefd4c2d529276e712fcd0eeb9d.tar.gz | |
2016-04-19 Ed Schonberg <schonberg@adacore.com>
* sem_attr.adb (Resolve_Attribute, case 'Access): Freeze
overloadable entity if originally overloaded.
2016-04-19 Arnaud Charlet <charlet@adacore.com>
* exp_aggr.adb, exp_ch3.adb, exp_ch7.adb, exp_ch9.adb, exp_code.adb,
exp_fixd.adb, namet.adb, osint.adb, osint.ads, par-ch2.adb,
sem_ch10.adb, sem_ch12.adb, sem_disp.adb, sem_elab.adb, sem_elim.adb
sem_util.adb, styleg.adb, styleg.ads, stylesw.ads: Minor code
clean up.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235194 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/exp_fixd.adb')
| -rw-r--r-- | gcc/ada/exp_fixd.adb | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/gcc/ada/exp_fixd.adb b/gcc/ada/exp_fixd.adb index 89aaf26ef44..97bc99b8370 100644 --- a/gcc/ada/exp_fixd.adb +++ b/gcc/ada/exp_fixd.adb @@ -404,15 +404,15 @@ package body Exp_Fixd is (N : Node_Id; X, Y, Z : Node_Id) return Node_Id is - Y_Size : constant Int := UI_To_Int (Esize (Etype (Y))); - Z_Size : constant Int := UI_To_Int (Esize (Etype (Z))); + Y_Size : constant Nat := UI_To_Int (Esize (Etype (Y))); + Z_Size : constant Nat := UI_To_Int (Esize (Etype (Z))); Expr : Node_Id; begin -- If denominator fits in 64 bits, we can build the operations directly -- without causing any intermediate overflow, so that's what we do. - if Int'Max (Y_Size, Z_Size) <= 32 then + if Nat'Max (Y_Size, Z_Size) <= 32 then return Build_Divide (N, X, Build_Multiply (N, Y, Z)); @@ -473,11 +473,11 @@ package body Exp_Fixd is is Loc : constant Source_Ptr := Sloc (N); - X_Size : constant Int := UI_To_Int (Esize (Etype (X))); - Y_Size : constant Int := UI_To_Int (Esize (Etype (Y))); - Z_Size : constant Int := UI_To_Int (Esize (Etype (Z))); + X_Size : constant Nat := UI_To_Int (Esize (Etype (X))); + Y_Size : constant Nat := UI_To_Int (Esize (Etype (Y))); + Z_Size : constant Nat := UI_To_Int (Esize (Etype (Z))); - QR_Siz : Int; + QR_Siz : Nat; QR_Typ : Entity_Id; Nnn : Entity_Id; @@ -489,7 +489,7 @@ package body Exp_Fixd is begin -- Find type that will allow computation of numerator - QR_Siz := Int'Max (X_Size, 2 * Int'Max (Y_Size, Z_Size)); + QR_Siz := Nat'Max (X_Size, 2 * Nat'Max (Y_Size, Z_Size)); if QR_Siz <= 16 then QR_Typ := Standard_Integer_16; @@ -499,7 +499,7 @@ package body Exp_Fixd is QR_Typ := Standard_Integer_64; -- For more than 64, bits, we use the 64-bit integer defined in - -- Interfaces, so that it can be handled by the runtime routine + -- Interfaces, so that it can be handled by the runtime routine. else QR_Typ := RTE (RE_Integer_64); @@ -784,15 +784,15 @@ package body Exp_Fixd is (N : Node_Id; X, Y, Z : Node_Id) return Node_Id is - X_Size : constant Int := UI_To_Int (Esize (Etype (X))); - Y_Size : constant Int := UI_To_Int (Esize (Etype (Y))); + X_Size : constant Nat := UI_To_Int (Esize (Etype (X))); + Y_Size : constant Nat := UI_To_Int (Esize (Etype (Y))); Expr : Node_Id; begin -- If numerator fits in 64 bits, we can build the operations directly -- without causing any intermediate overflow, so that's what we do. - if Int'Max (X_Size, Y_Size) <= 32 then + if Nat'Max (X_Size, Y_Size) <= 32 then return Build_Divide (N, Build_Multiply (N, X, Y), Z); @@ -850,11 +850,11 @@ package body Exp_Fixd is is Loc : constant Source_Ptr := Sloc (N); - X_Size : constant Int := UI_To_Int (Esize (Etype (X))); - Y_Size : constant Int := UI_To_Int (Esize (Etype (Y))); - Z_Size : constant Int := UI_To_Int (Esize (Etype (Z))); + X_Size : constant Nat := UI_To_Int (Esize (Etype (X))); + Y_Size : constant Nat := UI_To_Int (Esize (Etype (Y))); + Z_Size : constant Nat := UI_To_Int (Esize (Etype (Z))); - QR_Siz : Int; + QR_Siz : Nat; QR_Typ : Entity_Id; Nnn : Entity_Id; @@ -866,7 +866,7 @@ package body Exp_Fixd is begin -- Find type that will allow computation of numerator - QR_Siz := Int'Max (X_Size, 2 * Int'Max (Y_Size, Z_Size)); + QR_Siz := Nat'Max (X_Size, 2 * Nat'Max (Y_Size, Z_Size)); if QR_Siz <= 16 then QR_Typ := Standard_Integer_16; @@ -876,7 +876,7 @@ package body Exp_Fixd is QR_Typ := Standard_Integer_64; -- For more than 64, bits, we use the 64-bit integer defined in - -- Interfaces, so that it can be handled by the runtime routine + -- Interfaces, so that it can be handled by the runtime routine. else QR_Typ := RTE (RE_Integer_64); |