aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorGhjuvan Lacambre <lacambre@adacore.com>2021-05-25 14:12:37 +0200
committerPierre-Marie de Rodat <derodat@adacore.com>2021-07-08 13:34:18 +0000
commitcd4341ef953bc5697917b3e6e43c59be03da0bee (patch)
tree265e12f8c9985d08f761fbe484821f81c8a69f50 /gcc
parent242c0f4772c6697ba0b27853f153a13970bbded9 (diff)
downloadgcc-cd4341ef953bc5697917b3e6e43c59be03da0bee.zip
gcc-cd4341ef953bc5697917b3e6e43c59be03da0bee.tar.gz
gcc-cd4341ef953bc5697917b3e6e43c59be03da0bee.tar.bz2
[Ada] Prevent crash on inspection point for unfrozen entity
gcc/ada/ * exp_prag.adb (Expand_Pragma_Inspection_Point): After expansion of the Inspection_Point pragma, check if referenced entities that have a freeze node are already frozen. If they aren't, emit a warning and turn the pragma into a no-op.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/exp_prag.adb31
1 files changed, 31 insertions, 0 deletions
diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb
index 2828f5a..f686395 100644
--- a/gcc/ada/exp_prag.adb
+++ b/gcc/ada/exp_prag.adb
@@ -2361,6 +2361,7 @@ package body Exp_Prag is
S : Entity_Id;
E : Entity_Id;
+ Remove_Inspection_Point : Boolean := False;
begin
if No (Pragma_Argument_Associations (N)) then
A := New_List;
@@ -2400,6 +2401,36 @@ package body Exp_Prag is
Expand (Expression (Assoc));
Next (Assoc);
end loop;
+
+ -- If any of the references have a freeze node, it must appear before
+ -- pragma Inspection_Point, otherwise the entity won't be available when
+ -- Gigi processes Inspection_Point.
+ -- When this requirement isn't met, turn the pragma into a no-op.
+
+ Assoc := First (Pragma_Argument_Associations (N));
+ while Present (Assoc) loop
+
+ if Present (Freeze_Node (Entity (Expression (Assoc)))) and then
+ not Is_Frozen (Entity (Expression (Assoc)))
+ then
+ Error_Msg_NE ("?inspection point references unfrozen object &",
+ Assoc,
+ Entity (Expression (Assoc)));
+ Remove_Inspection_Point := True;
+ end if;
+
+ Next (Assoc);
+ end loop;
+
+ if Remove_Inspection_Point then
+ Error_Msg_N ("\pragma will be ignored", N);
+
+ -- We can't just remove the pragma from the tree as it might be
+ -- iterated over by the caller. Turn it into a null statement
+ -- instead.
+
+ Rewrite (N, Make_Null_Statement (Sloc (N)));
+ end if;
end Expand_Pragma_Inspection_Point;
--------------------------------------