From: Ghjuvan Lacambre <lacambre@adacore.com>
Date: Wed, 2 Jul 2025 07:11:03 +0000 (+0200)
Subject: ada: exp_util.adb: prevent infinite loop in case of broken code
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83219c97fabc1c0a8e0c42ad3d023706b8132827;p=thirdparty%2Fgcc.git

ada: exp_util.adb: prevent infinite loop in case of broken code

A recent commit modified exp_util.adb in order to fix the selection of
Finalize subprograms in the case of untagged objects.
This introduced regressions for GNATSAS in fixedbugs by causing
GNAT2SCIL to loop over the same type over and over in case of broken
code.
We fix this by simply checking that the loop is making progress, and if
it doesn't, assume that we're done.

gcc/ada/ChangeLog:

	* exp_util.adb (Finalize_Address): Prevent infinite loop
---

diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index 2172ce75709..80e9a810116 100644
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -6191,12 +6191,17 @@ package body Exp_Util is
 
          else
             declare
-               Root : constant Entity_Id := Underlying_Type (Root_Type (Btyp));
+               Root      : constant Entity_Id :=
+                 Underlying_Type (Root_Type (Btyp));
+               Prev_Utyp : Entity_Id := Empty;
             begin
                if Is_Protected_Type (Root) then
                   Utyp := Corresponding_Record_Type (Root);
                else
-                  while No (TSS (Utyp, TSS_Finalize_Address)) loop
+                  while No (TSS (Utyp, TSS_Finalize_Address))
+                    and then Utyp /= Prev_Utyp
+                  loop
+                     Prev_Utyp := Utyp;
                      Utyp := Underlying_Type (Base_Type (Etype (Utyp)));
                   end loop;
                end if;