diff options
| author | Steve Baird <baird@adacore.com> | 2021-09-30 17:36:38 -0700 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-10-11 13:38:12 +0000 |
| commit | 939047f542ddbe43a36d755a39ba3b531bb5d8cc (patch) | |
| tree | 9fc6e24775456cbde0dbcc8c409690209a50ebfa /gcc/ada/sem_attr.adb | |
| parent | 2ad5d5e3d5d40f220df7239b54d5017259dc4d1d (diff) | |
| download | gcc-939047f542ddbe43a36d755a39ba3b531bb5d8cc.zip gcc-939047f542ddbe43a36d755a39ba3b531bb5d8cc.tar.gz gcc-939047f542ddbe43a36d755a39ba3b531bb5d8cc.tar.bz2 | |
[Ada] Valid postconditions incorrectly rejected.
gcc/ada/
* sem_attr.adb (Analyze_Attribute_Old_Result): Permit an
attribute reference inside a compiler-generated _Postconditions
procedure. In this case, Subp_Decl is assigned the declaration
of the enclosing subprogram.
* exp_util.adb (Insert_Actions): When climbing up the tree
looking for an insertion point, do not climb past an
N_Iterated_Component/Element_Association, since this could
result in inserting a reference to a loop parameter at a
location outside of the scope of that loop parameter. On the
other hand, be careful to preserve existing behavior in the case
of an N_Component_Association node.
Diffstat (limited to 'gcc/ada/sem_attr.adb')
| -rw-r--r-- | gcc/ada/sem_attr.adb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb index 4d69d58..32c5d37 100644 --- a/gcc/ada/sem_attr.adb +++ b/gcc/ada/sem_attr.adb @@ -1413,6 +1413,15 @@ package body Sem_Attr is return; end if; + -- 'Old attribute reference ok in a _Postconditions procedure + + elsif Nkind (Prag) = N_Subprogram_Body + and then not Comes_From_Source (Prag) + and then Nkind (Corresponding_Spec (Prag)) = N_Defining_Identifier + and then Chars (Corresponding_Spec (Prag)) = Name_uPostconditions + then + null; + -- Otherwise the placement of the attribute is illegal else @@ -1424,6 +1433,15 @@ package body Sem_Attr is if Nkind (Prag) = N_Aspect_Specification then Subp_Decl := Parent (Prag); + elsif Nkind (Prag) = N_Subprogram_Body then + declare + Enclosing_Scope : constant Node_Id := + Scope (Corresponding_Spec (Prag)); + begin + pragma Assert (Postconditions_Proc (Enclosing_Scope) + = Corresponding_Spec (Prag)); + Subp_Decl := Parent (Parent (Enclosing_Scope)); + end; else Subp_Decl := Find_Related_Declaration_Or_Body (Prag); end if; |