From: Eric Botcazou Date: Fri, 16 Dec 2022 15:32:15 +0000 (+0100) Subject: ada: Further adjust freezing for expansion of contracts X-Git-Tag: basepoints/gcc-14~2188 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59d1681bf3dec3a5077247a77e4862516b561284;p=thirdparty%2Fgcc.git ada: Further adjust freezing for expansion of contracts This further adjusts a test deciding whether to freeze an entity coming from an outer scope in an inner scope based on language rules, to the presence of the new internal subprogram generated because of post-conditions. gcc/ada/ * freeze.adb (Freeze_Entity): For the purpose of deciding whether to freeze an entity coming from an outer scope in an inner scope, treat the internal subprogram generated because of post-conditions as also coming from source if the original subprogram itself does. --- diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index 7f78b4315a84..97a25d108350 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -6281,7 +6281,10 @@ package body Freeze is end if; -- Otherwise, loop through scopes checking if an enclosing scope - -- comes from source or is a generic. + -- comes from source or is a generic. Note that, for the purpose + -- of this test, we need to consider that the internally generated + -- subprogram described above comes from source too if the original + -- subprogram itself does. declare S : Entity_Id; @@ -6291,6 +6294,8 @@ package body Freeze is while Present (S) loop if Is_Overloadable (S) then if Comes_From_Source (S) + or else (Chars (S) = Name_uWrapped_Statements + and then Comes_From_Source (Scope (S))) or else Is_Generic_Instance (S) or else Is_Child_Unit (S) then