From: Eric Botcazou Date: Mon, 5 May 2025 14:59:13 +0000 (+0200) Subject: ada: Fix wrong finalization of constrained array derived from unconstrained X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=579c431fa3728f1cb2d99df862ebf6c475cf01b2;p=thirdparty%2Fgcc.git ada: Fix wrong finalization of constrained array derived from unconstrained The bug had been present for dynamically allocated objects since the first rewrite of the finalization machinery more than a decade ago, and was then propagated to statically declared objects by the recent rewrite. gcc/ada/ChangeLog: * exp_util.adb (Finalize_Address): Do not go to the root type for array types. --- diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb index ffaf4541146..811f9ab742f 100644 --- a/gcc/ada/exp_util.adb +++ b/gcc/ada/exp_util.adb @@ -6182,9 +6182,10 @@ package body Exp_Util is -- now known to be protected, the finalization routine is the one -- defined on the corresponding record of the ancestor (corresponding -- records do not automatically inherit operations, but maybe they - -- should???) + -- should???). This does not apply to array types, where every base + -- type has a finalization routine that depends on the first subtype. - if Is_Untagged_Derivation (Btyp) then + if Is_Untagged_Derivation (Btyp) and then not Is_Array_Type (Btyp) then if Is_Protected_Type (Btyp) then Utyp := Corresponding_Record_Type (Root_Type (Btyp));