* [Ada] Do not mark user parameters of protected subprograms as artificial
@ 2022-09-12 8:19 Marc Poulhiès
0 siblings, 0 replies; only message in thread
From: Marc Poulhiès @ 2022-09-12 8:19 UTC (permalink / raw)
To: gcc-patches; +Cc: Eric Botcazou
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
This occurs because protected subprograms are not translated directly into
object code but first rewritten as a pair of subprograms by the front-end.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* exp_ch9.adb (Build_Protected_Spec): Tidy up and propagate the
Comes_From_Source flag onto the new formal parameters.
* sem_ch6.adb (Analyze_Subprogram_Body_Helper): Do not check
references for subprograms generated for protected subprograms.
[-- Attachment #2: patch.diff --]
[-- Type: text/x-diff, Size: 2949 bytes --]
diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb
--- a/gcc/ada/exp_ch9.adb
+++ b/gcc/ada/exp_ch9.adb
@@ -3868,32 +3868,35 @@ package body Exp_Ch9 is
Ident : Entity_Id;
Unprotected : Boolean := False) return List_Id
is
- Loc : constant Source_Ptr := Sloc (N);
- Decl : Node_Id;
- Formal : Entity_Id;
- New_Plist : List_Id;
- New_Param : Node_Id;
+ Loc : constant Source_Ptr := Sloc (N);
+
+ Decl : Node_Id;
+ Formal : Entity_Id;
+ New_Formal : Entity_Id;
+ New_Plist : List_Id;
begin
New_Plist := New_List;
Formal := First_Formal (Ident);
while Present (Formal) loop
- New_Param :=
+ New_Formal :=
+ Make_Defining_Identifier (Sloc (Formal), Chars (Formal));
+ Set_Comes_From_Source (New_Formal, Comes_From_Source (Formal));
+
+ if Unprotected then
+ Mutate_Ekind (New_Formal, Ekind (Formal));
+ Set_Protected_Formal (Formal, New_Formal);
+ end if;
+
+ Append_To (New_Plist,
Make_Parameter_Specification (Loc,
- Defining_Identifier =>
- Make_Defining_Identifier (Sloc (Formal), Chars (Formal)),
+ Defining_Identifier => New_Formal,
Aliased_Present => Aliased_Present (Parent (Formal)),
In_Present => In_Present (Parent (Formal)),
Out_Present => Out_Present (Parent (Formal)),
- Parameter_Type => New_Occurrence_Of (Etype (Formal), Loc));
-
- if Unprotected then
- Set_Protected_Formal (Formal, Defining_Identifier (New_Param));
- Mutate_Ekind (Defining_Identifier (New_Param), Ekind (Formal));
- end if;
+ Parameter_Type => New_Occurrence_Of (Etype (Formal), Loc)));
- Append (New_Param, New_Plist);
Next_Formal (Formal);
end loop;
diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -5511,12 +5511,22 @@ package body Sem_Ch6 is
-- Check references of the subprogram spec when we are dealing with
-- an expression function due to it having a generated body.
- -- Otherwise, we simply check the formals of the subprogram body.
if Present (Spec_Id)
and then Is_Expression_Function (Spec_Id)
then
Check_References (Spec_Id);
+
+ -- Skip the check for subprograms generated for protected subprograms
+ -- because it is also done for the protected subprograms themselves.
+
+ elsif Present (Spec_Id)
+ and then Present (Protected_Subprogram (Spec_Id))
+ then
+ null;
+
+ -- Otherwise, we simply check the formals of the subprogram body.
+
else
Check_References (Body_Id);
end if;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-09-12 8:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-12 8:19 [Ada] Do not mark user parameters of protected subprograms as artificial 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).