This prevents the freezing mechanism from putting a node inside the
subprogram body generated for a predicate function, which can for
example happen for a function referenced in the predicate.
Tested on x86_64-pc-linux-gnu, committed on trunk
gcc/ada/
* freeze.adb (In_Expanded_Body): Return true for the body of a
generated predicate function.diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -7054,11 +7054,11 @@ package body Freeze is
-- as well.
function In_Expanded_Body (N : Node_Id) return Boolean;
- -- Given an N_Handled_Sequence_Of_Statements node N, determines whether
- -- it is the handled statement sequence of an expander-generated
- -- subprogram: init proc, stream subprogram, renaming as body, or body
- -- created for an expression function. If so, this is not a freezing
- -- context and the entity will be frozen at a later point.
+ -- Given an N_Handled_Sequence_Of_Statements node, determines whether it
+ -- is the statement sequence of an expander-generated subprogram: body
+ -- created for an expression function, for a predicate function, an init
+ -- proc, a stream subprogram, or a renaming as body. If so, this is not
+ -- a freezing context and the entity will be frozen at a later point.
-----------------------------------------
-- Find_Aggregate_Component_Desig_Type --
@@ -7112,6 +7112,13 @@ package body Freeze is
elsif Was_Expression_Function (P) then
return not Comes_From_Source (P);
+ -- This is the body of a generated predicate function
+
+ elsif Present (Corresponding_Spec (P))
+ and then Is_Predicate_Function (Corresponding_Spec (P))
+ then
+ return True;
+
else
Id := Defining_Unit_Name (Specification (P));
