From: Piotr Trojanek <troja...@adacore.com>
The new handling of aspects stores the aspect expression as the
Expression_Copy of the aspect and not as the Entity of the aspect
identified. This has been changed for most of the aspects, but not for
Type_Invariant and Default_Initial_Condition, which have custom
expansion. Apparently this change only affects GNATprove and not GNAT.
gcc/ada/
* exp_util.adb (Add_Own_DIC, Add_Own_Invariants): Store the aspect
expression in Expression_Copy.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/exp_util.adb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index 3e8d5997949..730889cae3e 100644
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -1893,7 +1893,7 @@ package body Exp_Util is
-- routines.
if Present (DIC_Asp) then
- Set_Entity (Identifier (DIC_Asp), New_Copy_Tree (Expr));
+ Set_Expression_Copy (DIC_Asp, New_Copy_Tree (Expr));
end if;
-- Once the DIC assertion expression is fully processed, add a check
@@ -3153,7 +3153,7 @@ package body Exp_Util is
-- Check_Aspect_At_xxx routines.
if Present (Prag_Asp) then
- Set_Entity (Identifier (Prag_Asp), New_Copy_Tree (Expr));
+ Set_Expression_Copy (Prag_Asp, New_Copy_Tree (Expr));
end if;
Add_Invariant_Check (Prag, Expr, Checks);
--
2.42.0
