OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Ada] Implement calls to abstract subprograms in class-wide pre/post-conditions

Browse Source 
In some special cases involving class-wide pre/post conditions, Ada
allows a non-dispatching call to an abstract function (which is usually
illegal).  Fix a bug in the implementation of Ada's rules about the
run-time behavior of such a call. Thanks to Javier Miranda for producing
this patch.

gcc/ada/

	* contracts.adb (Build_Call_Helper_Body): Improve handling of
	the case of a (legal) non-dispatching call to an abstract
	subprogram.
This commit is contained in:
Javier Miranda 2022-03-15 13:20:24 -07:00 committed by Pierre-Marie de Rodat
parent 8fc021c098
commit a08f366ae8
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcc/ada/contracts.adb
View File

@ -3899,7 +3899,16 @@ package body Contracts is
Set_Corresponding_Body (Helper_Decl, Body_Id);
Set_Must_Override (Body_Spec, False);
if Present (Class_Preconditions (Subp_Id)) then
if Present (Class_Preconditions (Subp_Id))
-- Evaluate the expression if we are building a dynamic helper
-- or we are building a static helper for a non-abstract tagged
-- type; for abstract tagged types the helper just returns True
-- since it is called by the indirect call wrapper (ICW).
and then
(Is_Dynamic
or else
not Is_Abstract_Type (Find_Dispatching_Type (Subp_Id)))
then
Return_Expr :=
Copy_And_Update_References (Class_Preconditions (Subp_Id));
@ -3910,7 +3919,8 @@ package body Contracts is
-- enabled.
else
pragma Assert (Present (Ignored_Class_Preconditions (Subp_Id)));
pragma Assert (Present (Ignored_Class_Preconditions (Subp_Id))
or else Is_Abstract_Type (Find_Dispatching_Type (Subp_Id)));
Return_Expr := New_Occurrence_Of (Standard_True, Loc);
end if;