]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
[Ada] Accept aspect Yield on subprogram bodies acting as specs
authorPiotr Trojanek <trojanek@adacore.com>
Tue, 11 Jan 2022 21:25:13 +0000 (22:25 +0100)
committerPierre-Marie de Rodat <derodat@adacore.com>
Tue, 12 Jul 2022 12:24:11 +0000 (12:24 +0000)
A small fix for the aspect Yield defined in AI12-0279 for Ada 2022, to
accept aspect given for a subprogram body which acts as its own spec.

For example:

   procedure Switch with Yield => True is
   begin
      ...
   end Switch;

gcc/ada/

* sem_ch13.adb (Analyze_Aspect_Yield): Look at the entity kind,
not at the declaration kind.

gcc/ada/sem_ch13.adb

index bb654abe412ae87a3a4dc6064303fd9ff9401434..c6683108540557a9dc31796fbe08264d00d60545 100644 (file)
@@ -2724,13 +2724,11 @@ package body Sem_Ch13 is
                Expr_Value : Boolean := False;
 
             begin
-               --  Check valid declarations for 'Yield
+               --  Check valid entity for 'Yield
 
-               if Nkind (N) in N_Abstract_Subprogram_Declaration
-                             | N_Entry_Declaration
-                             | N_Generic_Subprogram_Declaration
-                             | N_Subprogram_Declaration
-                             | N_Formal_Subprogram_Declaration
+               if (Is_Subprogram (E)
+                     or else Is_Generic_Subprogram (E)
+                     or else Is_Entry (E))
                  and then not Within_Protected_Type (E)
                then
                   null;