From: "Marc Poulhiès" <poulhies@adacore.com>
To: gcc-patches@gcc.gnu.org
Cc: Piotr Trojanek <trojanek@adacore.com>
Subject: [Ada] Retain Has_Private_View flag for actuals of inlined subprograms
Date: Tue, 6 Sep 2022 09:15:58 +0200 [thread overview]
Message-ID: <20220906071558.GA1280468@poulhies-Precision-5550> (raw)
[-- Attachment #1: Type: text/plain, Size: 715 bytes --]
When instantiating a body to inline (either because frontend inlining is
enabled with switch -gnatN or because of inlining-for-proof in GNATprove
mode) we rewrite occurrences of formal parameters into the corresponding
actual parameters. Then we switch type views, so that if the formal had
a full view in the body to inline then the corresponding actual will
have a full view in the particular inlined body.
However, when rewriting occurrences of the formal parameter we were
losing information about whether the formal had a private view.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* inline.adb (Process_Formals): Preserve Has_Private_View flag while
rewriting formal into actual parameters.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 1448 bytes --]
diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb
--- a/gcc/ada/inline.adb
+++ b/gcc/ada/inline.adb
@@ -3367,6 +3367,8 @@ package body Inline is
E : Entity_Id;
Ret : Node_Id;
+ Had_Private_View : Boolean;
+
begin
if Is_Entity_Name (N) and then Present (Entity (N)) then
E := Entity (N);
@@ -3380,13 +3382,21 @@ package body Inline is
-- subtype is private at the call point but its full view is
-- visible to the body, then the inlined tree here must be
-- analyzed with the full view).
+ --
+ -- The Has_Private_View flag is cleared by rewriting, so it
+ -- must be explicitly saved and restored, just like when
+ -- instantiating the body to inline.
if Is_Entity_Name (A) then
+ Had_Private_View := Has_Private_View (N);
Rewrite (N, New_Occurrence_Of (Entity (A), Sloc (N)));
+ Set_Has_Private_View (N, Had_Private_View);
Check_Private_View (N);
elsif Nkind (A) = N_Defining_Identifier then
+ Had_Private_View := Has_Private_View (N);
Rewrite (N, New_Occurrence_Of (A, Sloc (N)));
+ Set_Has_Private_View (N, Had_Private_View);
Check_Private_View (N);
-- Numeric literal
reply other threads:[~2022-09-06 7:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220906071558.GA1280468@poulhies-Precision-5550 \
--to=poulhies@adacore.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=trojanek@adacore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).