public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-1623] [Ada] Fix buffer overrun for small string concatenation at -O0
@ 2022-07-12 12:25 Pierre-Marie de Rodat
  0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2022-07-12 12:25 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:01bf0d6cf53c8c5909f07d89a188b8b1a7a8f179

commit r13-1623-g01bf0d6cf53c8c5909f07d89a188b8b1a7a8f179
Author: Eric Botcazou <ebotcazou@adacore.com>
Date:   Tue Jun 21 22:17:13 2022 +0200

    [Ada] Fix buffer overrun for small string concatenation at -O0
    
    The concatenation routines may read too much data on the source side when
    the destination buffer is larger than the final result.  This change makes
    sure that this does not happen any more and also removes obsolete stuff.
    
    gcc/ada/
    
            * rtsfind.ads (RE_Id): Remove RE_Str_Concat_Bounds_N values.
            (RE_Unit_Table): Remove RE_Str_Concat_Bounds_N entries.
            * libgnat/s-conca2.ads (Str_Concat_2): Adjust head comment.
            (Str_Concat_Bounds_2): Delete.
            * libgnat/s-conca2.adb (Str_Concat_2): Use the length of the last
            input to size the last assignment.
            (Str_Concat_Bounds_2): Delete.
            * libgnat/s-conca3.ads (Str_Concat_3): Adjust head comment.
            (Str_Concat_Bounds_3): Delete.
            * libgnat/s-conca3.adb (Str_Concat_3): Use the length of the last
            input to size the last assignment.
            (Str_Concat_Bounds_3): Delete.
            * libgnat/s-conca4.ads (Str_Concat_4): Adjust head comment.
            (Str_Concat_Bounds_4): Delete.
            * libgnat/s-conca4.adb (Str_Concat_4): Use the length of the last
            input to size the last assignment.
            (Str_Concat_Bounds_4): Delete.
            * libgnat/s-conca5.ads (Str_Concat_5): Adjust head comment.
            (Str_Concat_Bounds_5): Delete.
            * libgnat/s-conca5.adb (Str_Concat_5): Use the length of the last
            input to size the last assignment.
            (Str_Concat_Bounds_5): Delete.
            * libgnat/s-conca6.ads (Str_Concat_6): Adjust head comment.
            (Str_Concat_Bounds_6): Delete.
            * libgnat/s-conca6.adb (Str_Concat_6): Use the length of the last
            input to size the last assignment.
            (Str_Concat_Bounds_6): Delete.
            * libgnat/s-conca7.ads (Str_Concat_7): Adjust head comment.
            (Str_Concat_Bounds_7): Delete.
            * libgnat/s-conca7.adb (Str_Concat_7): Use the length of the last
            input to size the last assignment.
            (Str_Concat_Bounds_7): Delete.
            * libgnat/s-conca8.ads (Str_Concat_8): Adjust head comment.
            (Str_Concat_Bounds_8): Delete.
            * libgnat/s-conca8.adb (Str_Concat_8): Use the length of the last
            input to size the last assignment.
            (Str_Concat_Bounds_8): Delete.
            * libgnat/s-conca9.ads (Str_Concat_9): Adjust head comment.
            (Str_Concat_Bounds_9): Delete.
            * libgnat/s-conca9.adb (Str_Concat_9): Use the length of the last
            input to size the last assignment.
            (Str_Concat_Bounds_9): Delete.

Diff:
---
 gcc/ada/libgnat/s-conca2.adb | 20 +-------------------
 gcc/ada/libgnat/s-conca2.ads |  9 +--------
 gcc/ada/libgnat/s-conca3.adb | 21 +--------------------
 gcc/ada/libgnat/s-conca3.ads | 11 ++---------
 gcc/ada/libgnat/s-conca4.adb | 21 +--------------------
 gcc/ada/libgnat/s-conca4.ads |  9 +--------
 gcc/ada/libgnat/s-conca5.adb | 21 +--------------------
 gcc/ada/libgnat/s-conca5.ads |  9 +--------
 gcc/ada/libgnat/s-conca6.adb | 21 +--------------------
 gcc/ada/libgnat/s-conca6.ads |  9 +--------
 gcc/ada/libgnat/s-conca7.adb | 21 +--------------------
 gcc/ada/libgnat/s-conca7.ads |  9 +--------
 gcc/ada/libgnat/s-conca8.adb | 22 +---------------------
 gcc/ada/libgnat/s-conca8.ads | 11 ++---------
 gcc/ada/libgnat/s-conca9.adb | 22 +---------------------
 gcc/ada/libgnat/s-conca9.ads | 11 ++---------
 gcc/ada/rtsfind.ads          | 18 ------------------
 17 files changed, 19 insertions(+), 246 deletions(-)

diff --git a/gcc/ada/libgnat/s-conca2.adb b/gcc/ada/libgnat/s-conca2.adb
index 49982f5642a..2a263caa769 100644
--- a/gcc/ada/libgnat/s-conca2.adb
+++ b/gcc/ada/libgnat/s-conca2.adb
@@ -46,26 +46,8 @@ package body System.Concat_2 is
       R (F .. L) := S1;
 
       F := L + 1;
-      L := R'Last;
+      L := F + S2'Length - 1;
       R (F .. L) := S2;
    end Str_Concat_2;
 
-   -------------------------
-   -- Str_Concat_Bounds_2 --
-   -------------------------
-
-   procedure Str_Concat_Bounds_2
-     (Lo, Hi : out Natural;
-      S1, S2 : String)
-   is
-   begin
-      if S1 = "" then
-         Lo := S2'First;
-         Hi := S2'Last;
-      else
-         Lo := S1'First;
-         Hi := S1'Last + S2'Length;
-      end if;
-   end Str_Concat_Bounds_2;
-
 end System.Concat_2;
diff --git a/gcc/ada/libgnat/s-conca2.ads b/gcc/ada/libgnat/s-conca2.ads
index f9c73933385..450435a0cf2 100644
--- a/gcc/ada/libgnat/s-conca2.ads
+++ b/gcc/ada/libgnat/s-conca2.ads
@@ -36,15 +36,8 @@ package System.Concat_2 is
 
    procedure Str_Concat_2 (R : out String; S1, S2 : String);
    --  Performs the operation R := S1 & S2. The bounds of R are known to be
-   --  correct (usually set by a call to the Str_Concat_Bounds_2 procedure
-   --  below), so no bounds checks are required, and it is known that none of
+   --  sufficient so no bound checks are required, and it is known that none of
    --  the input operands overlaps R. No assumptions can be made about the
    --  lower bounds of any of the operands.
 
-   procedure Str_Concat_Bounds_2
-     (Lo, Hi : out Natural;
-      S1, S2 : String);
-   --  Assigns to Lo..Hi the bounds of the result of concatenating the two
-   --  given strings, following the rules in the RM regarding null operands.
-
 end System.Concat_2;
diff --git a/gcc/ada/libgnat/s-conca3.adb b/gcc/ada/libgnat/s-conca3.adb
index d607082ca75..ddba8320ded 100644
--- a/gcc/ada/libgnat/s-conca3.adb
+++ b/gcc/ada/libgnat/s-conca3.adb
@@ -29,8 +29,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with System.Concat_2;
-
 package body System.Concat_3 is
 
    pragma Suppress (All_Checks);
@@ -52,25 +50,8 @@ package body System.Concat_3 is
       R (F .. L) := S2;
 
       F := L + 1;
-      L := R'Last;
+      L := F + S3'Length - 1;
       R (F .. L) := S3;
    end Str_Concat_3;
 
-   -------------------------
-   -- Str_Concat_Bounds_3 --
-   -------------------------
-
-   procedure Str_Concat_Bounds_3
-     (Lo, Hi     : out Natural;
-      S1, S2, S3 : String)
-   is
-   begin
-      System.Concat_2.Str_Concat_Bounds_2 (Lo, Hi, S2, S3);
-
-      if S1 /= "" then
-         Hi := S1'Last + Hi - Lo + 1;
-         Lo := S1'First;
-      end if;
-   end Str_Concat_Bounds_3;
-
 end System.Concat_3;
diff --git a/gcc/ada/libgnat/s-conca3.ads b/gcc/ada/libgnat/s-conca3.ads
index d7282ff1a33..2ff3abc2ff0 100644
--- a/gcc/ada/libgnat/s-conca3.ads
+++ b/gcc/ada/libgnat/s-conca3.ads
@@ -36,15 +36,8 @@ package System.Concat_3 is
 
    procedure Str_Concat_3 (R : out String; S1, S2, S3 : String);
    --  Performs the operation R := S1 & S2 & S3. The bounds of R are known to
-   --  be correct (usually set by a call to the Str_Concat_Bounds_3 procedure
-   --  below), so no bounds checks are required, and it is known that none of
-   --  the input operands overlaps R. No assumptions can be made about the
+   --  be sufficient so no bound checks are required, and it is known that none
+   --  of the input operands overlaps R. No assumptions can be made about the
    --  lower bounds of any of the operands.
 
-   procedure Str_Concat_Bounds_3
-     (Lo, Hi     : out Natural;
-      S1, S2, S3 : String);
-   --  Assigns to Lo..Hi the bounds of the result of concatenating the three
-   --  given strings, following the rules in the RM regarding null operands.
-
 end System.Concat_3;
diff --git a/gcc/ada/libgnat/s-conca4.adb b/gcc/ada/libgnat/s-conca4.adb
index 694033a42a0..e1c7e926e9d 100644
--- a/gcc/ada/libgnat/s-conca4.adb
+++ b/gcc/ada/libgnat/s-conca4.adb
@@ -29,8 +29,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with System.Concat_3;
-
 package body System.Concat_4 is
 
    pragma Suppress (All_Checks);
@@ -56,25 +54,8 @@ package body System.Concat_4 is
       R (F .. L) := S3;
 
       F := L + 1;
-      L := R'Last;
+      L := F + S4'Length - 1;
       R (F .. L) := S4;
    end Str_Concat_4;
 
-   -------------------------
-   -- Str_Concat_Bounds_4 --
-   -------------------------
-
-   procedure Str_Concat_Bounds_4
-     (Lo, Hi         : out Natural;
-      S1, S2, S3, S4 : String)
-   is
-   begin
-      System.Concat_3.Str_Concat_Bounds_3 (Lo, Hi, S2, S3, S4);
-
-      if S1 /= "" then
-         Hi := S1'Last + Hi - Lo + 1;
-         Lo := S1'First;
-      end if;
-   end Str_Concat_Bounds_4;
-
 end System.Concat_4;
diff --git a/gcc/ada/libgnat/s-conca4.ads b/gcc/ada/libgnat/s-conca4.ads
index 88b464d5743..ecc3108c977 100644
--- a/gcc/ada/libgnat/s-conca4.ads
+++ b/gcc/ada/libgnat/s-conca4.ads
@@ -36,15 +36,8 @@ package System.Concat_4 is
 
    procedure Str_Concat_4 (R : out String; S1, S2, S3, S4 : String);
    --  Performs the operation R := S1 & S2 & S3 & S4. The bounds
-   --  of R are known to be correct (usually set by a call to the
-   --  Str_Concat_Bounds_5 procedure below), so no bounds checks are required,
+   --  of R are known to be sufficient so no bound checks are required,
    --  and it is known that none of the input operands overlaps R. No
    --  assumptions can be made about the lower bounds of any of the operands.
 
-   procedure Str_Concat_Bounds_4
-     (Lo, Hi         : out Natural;
-      S1, S2, S3, S4 : String);
-   --  Assigns to Lo..Hi the bounds of the result of concatenating the four
-   --  given strings, following the rules in the RM regarding null operands.
-
 end System.Concat_4;
diff --git a/gcc/ada/libgnat/s-conca5.adb b/gcc/ada/libgnat/s-conca5.adb
index f611260c955..2283747d78a 100644
--- a/gcc/ada/libgnat/s-conca5.adb
+++ b/gcc/ada/libgnat/s-conca5.adb
@@ -29,8 +29,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with System.Concat_4;
-
 package body System.Concat_5 is
 
    pragma Suppress (All_Checks);
@@ -60,25 +58,8 @@ package body System.Concat_5 is
       R (F .. L) := S4;
 
       F := L + 1;
-      L := R'Last;
+      L := F + S5'Length - 1;
       R (F .. L) := S5;
    end Str_Concat_5;
 
-   -------------------------
-   -- Str_Concat_Bounds_5 --
-   -------------------------
-
-   procedure Str_Concat_Bounds_5
-     (Lo, Hi             : out Natural;
-      S1, S2, S3, S4, S5 : String)
-   is
-   begin
-      System.Concat_4.Str_Concat_Bounds_4 (Lo, Hi, S2, S3, S4, S5);
-
-      if S1 /= "" then
-         Hi := S1'Last + Hi - Lo + 1;
-         Lo := S1'First;
-      end if;
-   end Str_Concat_Bounds_5;
-
 end System.Concat_5;
diff --git a/gcc/ada/libgnat/s-conca5.ads b/gcc/ada/libgnat/s-conca5.ads
index f6b89888fef..be7aaceda47 100644
--- a/gcc/ada/libgnat/s-conca5.ads
+++ b/gcc/ada/libgnat/s-conca5.ads
@@ -36,15 +36,8 @@ package System.Concat_5 is
 
    procedure Str_Concat_5 (R : out String; S1, S2, S3, S4, S5 : String);
    --  Performs the operation R := S1 & S2 & S3 & S4 & S5. The bounds
-   --  of R are known to be correct (usually set by a call to the
-   --  Str_Concat_Bounds_5 procedure below), so no bounds checks are required,
+   --  of R are known to be sufficient so no bound checks are required,
    --  and it is known that none of the input operands overlaps R. No
    --  assumptions can be made about the lower bounds of any of the operands.
 
-   procedure Str_Concat_Bounds_5
-     (Lo, Hi             : out Natural;
-      S1, S2, S3, S4, S5 : String);
-   --  Assigns to Lo..Hi the bounds of the result of concatenating the five
-   --  given strings, following the rules in the RM regarding null operands.
-
 end System.Concat_5;
diff --git a/gcc/ada/libgnat/s-conca6.adb b/gcc/ada/libgnat/s-conca6.adb
index 66b767f3daa..b574d046146 100644
--- a/gcc/ada/libgnat/s-conca6.adb
+++ b/gcc/ada/libgnat/s-conca6.adb
@@ -29,8 +29,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with System.Concat_5;
-
 package body System.Concat_6 is
 
    pragma Suppress (All_Checks);
@@ -64,25 +62,8 @@ package body System.Concat_6 is
       R (F .. L) := S5;
 
       F := L + 1;
-      L := R'Last;
+      L := F + S6'Length - 1;
       R (F .. L) := S6;
    end Str_Concat_6;
 
-   -------------------------
-   -- Str_Concat_Bounds_6 --
-   -------------------------
-
-   procedure Str_Concat_Bounds_6
-     (Lo, Hi                 : out Natural;
-      S1, S2, S3, S4, S5, S6 : String)
-   is
-   begin
-      System.Concat_5.Str_Concat_Bounds_5 (Lo, Hi, S2, S3, S4, S5, S6);
-
-      if S1 /= "" then
-         Hi := S1'Last + Hi - Lo + 1;
-         Lo := S1'First;
-      end if;
-   end Str_Concat_Bounds_6;
-
 end System.Concat_6;
diff --git a/gcc/ada/libgnat/s-conca6.ads b/gcc/ada/libgnat/s-conca6.ads
index e753251acd9..2aac3d0fd56 100644
--- a/gcc/ada/libgnat/s-conca6.ads
+++ b/gcc/ada/libgnat/s-conca6.ads
@@ -36,15 +36,8 @@ package System.Concat_6 is
 
    procedure Str_Concat_6 (R : out String; S1, S2, S3, S4, S5, S6 : String);
    --  Performs the operation R := S1 & S2 & S3 & S4 & S5 & S6. The
-   --  bounds of R are known to be correct (usually set by a call to the
-   --  Str_Concat_Bounds_6 procedure below), so no bounds checks are required,
+   --  bounds of R are known to be sufficient so no bound checks are required,
    --  and it is known that none of the input operands overlaps R. No
    --  assumptions can be made about the lower bounds of any of the operands.
 
-   procedure Str_Concat_Bounds_6
-     (Lo, Hi                 : out Natural;
-      S1, S2, S3, S4, S5, S6 : String);
-   --  Assigns to Lo..Hi the bounds of the result of concatenating the six
-   --  given strings, following the rules in the RM regarding null operands.
-
 end System.Concat_6;
diff --git a/gcc/ada/libgnat/s-conca7.adb b/gcc/ada/libgnat/s-conca7.adb
index 02508873ccc..e624b5cd9ac 100644
--- a/gcc/ada/libgnat/s-conca7.adb
+++ b/gcc/ada/libgnat/s-conca7.adb
@@ -29,8 +29,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with System.Concat_6;
-
 package body System.Concat_7 is
 
    pragma Suppress (All_Checks);
@@ -71,25 +69,8 @@ package body System.Concat_7 is
       R (F .. L) := S6;
 
       F := L + 1;
-      L := R'Last;
+      L := F + S7'Length - 1;
       R (F .. L) := S7;
    end Str_Concat_7;
 
-   -------------------------
-   -- Str_Concat_Bounds_7 --
-   -------------------------
-
-   procedure Str_Concat_Bounds_7
-     (Lo, Hi                     : out Natural;
-      S1, S2, S3, S4, S5, S6, S7 : String)
-   is
-   begin
-      System.Concat_6.Str_Concat_Bounds_6 (Lo, Hi, S2, S3, S4, S5, S6, S7);
-
-      if S1 /= "" then
-         Hi := S1'Last + Hi - Lo + 1;
-         Lo := S1'First;
-      end if;
-   end Str_Concat_Bounds_7;
-
 end System.Concat_7;
diff --git a/gcc/ada/libgnat/s-conca7.ads b/gcc/ada/libgnat/s-conca7.ads
index c130ddf5347..755499568e2 100644
--- a/gcc/ada/libgnat/s-conca7.ads
+++ b/gcc/ada/libgnat/s-conca7.ads
@@ -38,15 +38,8 @@ package System.Concat_7 is
      (R                          : out String;
       S1, S2, S3, S4, S5, S6, S7 : String);
    --  Performs the operation R := S1 & S2 & S3 & S4 & S5 & S6 & S7. The
-   --  bounds of R are known to be correct (usually set by a call to the
-   --  Str_Concat_Bounds_8 procedure below), so no bounds checks are required,
+   --  bounds of R are known to be sufficient so no bound checks are required,
    --  and it is known that none of the input operands overlaps R. No
    --  assumptions can be made about the lower bounds of any of the operands.
 
-   procedure Str_Concat_Bounds_7
-     (Lo, Hi                     : out Natural;
-      S1, S2, S3, S4, S5, S6, S7 : String);
-   --  Assigns to Lo..Hi the bounds of the result of concatenating the seven
-   --  given strings, following the rules in the RM regarding null operands.
-
 end System.Concat_7;
diff --git a/gcc/ada/libgnat/s-conca8.adb b/gcc/ada/libgnat/s-conca8.adb
index d6ee36cb171..98b2e59b65c 100644
--- a/gcc/ada/libgnat/s-conca8.adb
+++ b/gcc/ada/libgnat/s-conca8.adb
@@ -29,8 +29,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with System.Concat_7;
-
 package body System.Concat_8 is
 
    pragma Suppress (All_Checks);
@@ -75,26 +73,8 @@ package body System.Concat_8 is
       R (F .. L) := S7;
 
       F := L + 1;
-      L := R'Last;
+      L := F + S8'Length - 1;
       R (F .. L) := S8;
    end Str_Concat_8;
 
-   -------------------------
-   -- Str_Concat_Bounds_8 --
-   -------------------------
-
-   procedure Str_Concat_Bounds_8
-     (Lo, Hi                         : out Natural;
-      S1, S2, S3, S4, S5, S6, S7, S8 : String)
-   is
-   begin
-      System.Concat_7.Str_Concat_Bounds_7
-        (Lo, Hi, S2, S3, S4, S5, S6, S7, S8);
-
-      if S1 /= "" then
-         Hi := S1'Last + Hi - Lo + 1;
-         Lo := S1'First;
-      end if;
-   end Str_Concat_Bounds_8;
-
 end System.Concat_8;
diff --git a/gcc/ada/libgnat/s-conca8.ads b/gcc/ada/libgnat/s-conca8.ads
index dda35c1e974..a2491548548 100644
--- a/gcc/ada/libgnat/s-conca8.ads
+++ b/gcc/ada/libgnat/s-conca8.ads
@@ -38,15 +38,8 @@ package System.Concat_8 is
      (R                              : out String;
       S1, S2, S3, S4, S5, S6, S7, S8 : String);
    --  Performs the operation R := S1 & S2 & S3 & S4 & S5 & S6 & S7 & S8.
-   --  The bounds of R are known to be correct (usually set by a call to the
-   --  Str_Concat_Bounds_8 procedure below), so no bounds checks are required,
-   --  and it is known that none of the input operands overlaps R. No
+   --  The bounds of R are known to be sufficient so no bound checks are
+   --  required and it is known that none of the input operands overlaps R. No
    --  assumptions can be made about the lower bounds of any of the operands.
 
-   procedure Str_Concat_Bounds_8
-     (Lo, Hi                         : out Natural;
-      S1, S2, S3, S4, S5, S6, S7, S8 : String);
-   --  Assigns to Lo..Hi the bounds of the result of concatenating the eight
-   --  given strings, following the rules in the RM regarding null operands.
-
 end System.Concat_8;
diff --git a/gcc/ada/libgnat/s-conca9.adb b/gcc/ada/libgnat/s-conca9.adb
index bfe228e9d66..08860f505af 100644
--- a/gcc/ada/libgnat/s-conca9.adb
+++ b/gcc/ada/libgnat/s-conca9.adb
@@ -29,8 +29,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with System.Concat_8;
-
 package body System.Concat_9 is
 
    pragma Suppress (All_Checks);
@@ -79,26 +77,8 @@ package body System.Concat_9 is
       R (F .. L) := S8;
 
       F := L + 1;
-      L := R'Last;
+      L := F + S9'Length - 1;
       R (F .. L) := S9;
    end Str_Concat_9;
 
-   -------------------------
-   -- Str_Concat_Bounds_9 --
-   -------------------------
-
-   procedure Str_Concat_Bounds_9
-     (Lo, Hi                             : out Natural;
-      S1, S2, S3, S4, S5, S6, S7, S8, S9 : String)
-   is
-   begin
-      System.Concat_8.Str_Concat_Bounds_8
-        (Lo, Hi, S2, S3, S4, S5, S6, S7, S8, S9);
-
-      if S1 /= "" then
-         Hi := S1'Last + Hi - Lo + 1;
-         Lo := S1'First;
-      end if;
-   end Str_Concat_Bounds_9;
-
 end System.Concat_9;
diff --git a/gcc/ada/libgnat/s-conca9.ads b/gcc/ada/libgnat/s-conca9.ads
index 7737a1e20e6..39560ffd94d 100644
--- a/gcc/ada/libgnat/s-conca9.ads
+++ b/gcc/ada/libgnat/s-conca9.ads
@@ -38,15 +38,8 @@ package System.Concat_9 is
      (R                                  : out String;
       S1, S2, S3, S4, S5, S6, S7, S8, S9 : String);
    --  Performs the operation R := S1 & S2 & S3 & S4 & S5 & S6 & S7 & S8 & S9.
-   --  The bounds of R are known to be correct (usually set by a call to the
-   --  Str_Concat_Bounds_9 procedure below), so no bounds checks are required,
-   --  and it is known that none of the input operands overlaps R. No
+   --  The bounds of R are known to be sufficient so no bound checks are
+   --  required, and it is known that none of the input operands overlaps R. No
    --  assumptions can be made about the lower bounds of any of the operands.
 
-   procedure Str_Concat_Bounds_9
-     (Lo, Hi                             : out Natural;
-      S1, S2, S3, S4, S5, S6, S7, S8, S9 : String);
-   --  Assigns to Lo..Hi the bounds of the result of concatenating the nine
-   --  given strings, following the rules in the RM regarding null operands.
-
 end System.Concat_9;
diff --git a/gcc/ada/rtsfind.ads b/gcc/ada/rtsfind.ads
index 127095578ef..65c64090371 100644
--- a/gcc/ada/rtsfind.ads
+++ b/gcc/ada/rtsfind.ads
@@ -910,15 +910,6 @@ package Rtsfind is
      RE_Str_Concat_8,                    -- System.Concat_8
      RE_Str_Concat_9,                    -- System.Concat_9
 
-     RE_Str_Concat_Bounds_2,             -- System.Concat_2
-     RE_Str_Concat_Bounds_3,             -- System.Concat_3
-     RE_Str_Concat_Bounds_4,             -- System.Concat_4
-     RE_Str_Concat_Bounds_5,             -- System.Concat_5
-     RE_Str_Concat_Bounds_6,             -- System.Concat_6
-     RE_Str_Concat_Bounds_7,             -- System.Concat_7
-     RE_Str_Concat_Bounds_8,             -- System.Concat_8
-     RE_Str_Concat_Bounds_9,             -- System.Concat_9
-
      RE_Get_Active_Partition_Id,         -- System.DSA_Services
      RE_Get_Local_Partition_Id,          -- System.DSA_Services
      RE_Get_Passive_Partition_Id,        -- System.DSA_Services
@@ -2608,15 +2599,6 @@ package Rtsfind is
      RE_Str_Concat_8                     => System_Concat_8,
      RE_Str_Concat_9                     => System_Concat_9,
 
-     RE_Str_Concat_Bounds_2              => System_Concat_2,
-     RE_Str_Concat_Bounds_3              => System_Concat_3,
-     RE_Str_Concat_Bounds_4              => System_Concat_4,
-     RE_Str_Concat_Bounds_5              => System_Concat_5,
-     RE_Str_Concat_Bounds_6              => System_Concat_6,
-     RE_Str_Concat_Bounds_7              => System_Concat_7,
-     RE_Str_Concat_Bounds_8              => System_Concat_8,
-     RE_Str_Concat_Bounds_9              => System_Concat_9,
-
      RE_Get_Active_Partition_Id          => System_DSA_Services,
      RE_Get_Local_Partition_Id           => System_DSA_Services,
      RE_Get_Passive_Partition_Id         => System_DSA_Services,


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-07-12 12:25 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-12 12:25 [gcc r13-1623] [Ada] Fix buffer overrun for small string concatenation at -O0 Pierre-Marie de Rodat

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).