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

[Ada] Disable inlining of traversal function in GNATprove 

Traversal functions as defined in SPARK RM 3.10 should not be inlined
for analysis in GNATprove, as this changes the ownership behavior.
Disable the inlining performed in GNATprove on functions which could be
interpreted as such.

There is no impact on compilation and thus no test.

2019-09-19  Yannick Moy  <moy@adacore.com>

gcc/ada/

	* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Add special
	case for traversal functions.

From-SVN: r275948
This commit is contained in:
Yannick Moy 2019-09-19 08:14:03 +00:00 committed by Pierre-Marie de Rodat
parent 09709b4781
commit 231ef54b96
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ada/ChangeLog
View File

@ -1,3 +1,8 @@
2019-09-19 Yannick Moy <moy@adacore.com>
* inline.adb (Can_Be_Inlined_In_GNATprove_Mode): Add special
case for traversal functions.
2019-09-19 Yannick Moy <moy@adacore.com>
* sem_prag.adb (Analyze_Global_In_Decl_Part): Do not issue an

29
gcc/ada/inline.adb
View File

@ -1512,6 +1512,12 @@ package body Inline is
-- Return True if subprogram Id is defined in the package specification,
-- either its visible or private part.
function Maybe_Traversal_Function (Id : Entity_Id) return Boolean;
-- Return True if subprogram Id could be a traversal function, as
-- defined in SPARK RM 3.10. This is only a safe approximation, as the
-- knowledge of the SPARK boundary is needed to determine exactly
-- traversal functions.
---------------------------------------------------
-- Has_Formal_With_Discriminant_Dependent_Fields --
---------------------------------------------------
@ -1635,6 +1641,20 @@ package body Inline is
return Nkind (Parent (Decl)) = N_Compilation_Unit;
end Is_Unit_Subprogram;
------------------------------
-- Maybe_Traversal_Function --
------------------------------
function Maybe_Traversal_Function (Id : Entity_Id) return Boolean is
begin
return Ekind (Id) = E_Function
-- Only traversal functions return an anonymous access-to-object
-- type in SPARK.
and then Is_Anonymous_Access_Type (Etype (Id));
end Maybe_Traversal_Function;
-- Local declarations
Id : Entity_Id;
@ -1757,6 +1777,15 @@ package body Inline is
elsif Has_Formal_With_Discriminant_Dependent_Fields (Id) then
return False;
-- Do not inline subprograms which may be traversal functions. Such
-- inlining introduces temporary variables of named access type for
-- which assignments are move instead of borrow/observe, possibly
-- leading to spurious errors when checking SPARK rules related to
-- pointer usage.
elsif Maybe_Traversal_Function (Id) then
return False;
-- Otherwise, this is a subprogram declared inside the private part of a
-- package, or inside a package body, or locally in a subprogram, and it
-- does not have any contract. Inline it.