public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-5019] ada: Further adjust freezing for expansion of contracts
@ 2023-01-05 14:38 Marc Poulhi?s
0 siblings, 0 replies; only message in thread
From: Marc Poulhi?s @ 2023-01-05 14:38 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:59d1681bf3dec3a5077247a77e4862516b561284
commit r13-5019-g59d1681bf3dec3a5077247a77e4862516b561284
Author: Eric Botcazou <ebotcazou@adacore.com>
Date: Fri Dec 16 16:32:15 2022 +0100
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:
---
gcc/ada/freeze.adb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index 7f78b4315a8..97a25d10835 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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-01-05 14:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-05 14:38 [gcc r13-5019] ada: Further adjust freezing for expansion of contracts Marc Poulhi?s
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).