diff options
| author | Piotr Trojanek <trojanek@adacore.com> | 2022-08-12 11:33:20 +0200 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2022-09-06 09:14:22 +0200 |
| commit | 8a99a8e6bcfd8c2ce739baaaca0e34d46c3343f2 (patch) | |
| tree | a42a4a8154321d68c5cb8a2d84bd3b291e188cf2 | |
| parent | 51abc0cc8691daecd7cec8372e4988e9f3f1913c (diff) | |
| download | gcc-8a99a8e6bcfd8c2ce739baaaca0e34d46c3343f2.zip gcc-8a99a8e6bcfd8c2ce739baaaca0e34d46c3343f2.tar.gz gcc-8a99a8e6bcfd8c2ce739baaaca0e34d46c3343f2.tar.bz2 | |
[Ada] Retain Has_Private_View flag for actuals of inlined subprograms
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.
gcc/ada/
* inline.adb (Process_Formals): Preserve Has_Private_View flag while
rewriting formal into actual parameters.
| -rw-r--r-- | gcc/ada/inline.adb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gcc/ada/inline.adb b/gcc/ada/inline.adb index ca86fb8..91e8f45 100644 --- 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 |