This changes a few runtime units to use explicit bounds based on
Long_Long_Integer instead of maximal values from System, which may
become very large when 128-bit types are supported.
They are used for index types and memory byte counts and, therefore,
the magnitude provided by Long_Long_Integer is sufficient for them.
No functional changes.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* libgnat/a-cfinve.adb (Int): Use subtype of Long_Long_Integer.
* libgnat/a-cofove.adb (Int): Likewise.
* libgnat/a-cgcaso.adb (T): Likewise.
* libgnat/a-cogeso.adb (T): Likewise.
* libgnat/g-debpoo.ads (Byte_Count): Use Long_Long_Integer'Size.diff --git a/gcc/ada/libgnat/a-cfinve.adb b/gcc/ada/libgnat/a-cfinve.adb
--- a/gcc/ada/libgnat/a-cfinve.adb
+++ b/gcc/ada/libgnat/a-cfinve.adb
@@ -40,7 +40,7 @@ is
-- When growing a container, multiply current capacity by this. Doubling
-- leads to amortized linear-time copying.
- type Int is range System.Min_Int .. System.Max_Int;
+ subtype Int is Long_Long_Integer;
procedure Free is
new Ada.Unchecked_Deallocation (Elements_Array, Elements_Array_Ptr);
diff --git a/gcc/ada/libgnat/a-cgcaso.adb b/gcc/ada/libgnat/a-cgcaso.adb
--- a/gcc/ada/libgnat/a-cgcaso.adb
+++ b/gcc/ada/libgnat/a-cgcaso.adb
@@ -29,12 +29,10 @@
-- This algorithm was adapted from GNAT.Heap_Sort_G (see g-hesorg.ad[sb])
-with System;
-
procedure Ada.Containers.Generic_Constrained_Array_Sort
(Container : in out Array_Type)
is
- type T is range System.Min_Int .. System.Max_Int;
+ subtype T is Long_Long_Integer;
function To_Index (J : T) return Index_Type;
pragma Inline (To_Index);
diff --git a/gcc/ada/libgnat/a-cofove.adb b/gcc/ada/libgnat/a-cofove.adb
--- a/gcc/ada/libgnat/a-cofove.adb
+++ b/gcc/ada/libgnat/a-cofove.adb
@@ -33,7 +33,7 @@ package body Ada.Containers.Formal_Vectors with
SPARK_Mode => Off
is
- type Int is range System.Min_Int .. System.Max_Int;
+ subtype Int is Long_Long_Integer;
function To_Array_Index (Index : Index_Type'Base) return Count_Type'Base;
diff --git a/gcc/ada/libgnat/a-cogeso.adb b/gcc/ada/libgnat/a-cogeso.adb
--- a/gcc/ada/libgnat/a-cogeso.adb
+++ b/gcc/ada/libgnat/a-cogeso.adb
@@ -29,10 +29,8 @@
-- This algorithm was adapted from GNAT.Heap_Sort (see g-heasor.ad[sb])
-with System;
-
procedure Ada.Containers.Generic_Sort (First, Last : Index_Type'Base) is
- type T is range System.Min_Int .. System.Max_Int;
+ subtype T is Long_Long_Integer;
function To_Index (J : T) return Index_Type;
pragma Inline (To_Index);
diff --git a/gcc/ada/libgnat/g-debpoo.ads b/gcc/ada/libgnat/g-debpoo.ads
--- a/gcc/ada/libgnat/g-debpoo.ads
+++ b/gcc/ada/libgnat/g-debpoo.ads
@@ -299,7 +299,7 @@ package GNAT.Debug_Pools is
-- If Valid is True, Size_In_Storage_Elements is set to the size of this
-- chunk of memory.
- type Byte_Count is mod System.Max_Binary_Modulus;
+ type Byte_Count is mod 2 ** Long_Long_Integer'Size;
-- Type used for maintaining byte counts, needs to be large enough to
-- to accommodate counts allowing for repeated use of the same memory.
