2020-06-15 Ed Schonberg <schonberg@adacore.com>
gcc/ada/
* freeze.adb (Freeze_Expression): When traversing the tree
looking for the proper insertion point for the freeze node of an
entity that is declared in an outer scope, set the candidate
subprogram body node properly. Previous code has an off-by-one
error.
return;
end if;
- exit when
- Nkind (Parent_P) = N_Subprogram_Body
+ -- If the parent is a subprogram body, the candidate insertion
+ -- point is just ahead of it.
+
+ if Nkind (Parent_P) = N_Subprogram_Body
and then Unique_Defining_Entity (Parent_P) =
- Freeze_Outside_Subp;
+ Freeze_Outside_Subp
+ then
+ P := Parent_P;
+ exit;
+ end if;
P := Parent_P;
end loop;