aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2023-02-01 17:46:17 +0100
committerMarc Poulhiès <poulhies@adacore.com>2023-05-22 10:44:08 +0200
commitf23d4b88f5beffd8430b6b75088775614ed13980 (patch)
tree61e40052e25428eeca505692237907a5cc5e255c
parent05e628c249e56ae337f87fc2fd9be4fff16b6282 (diff)
downloadgcc-f23d4b88f5beffd8430b6b75088775614ed13980.zip
gcc-f23d4b88f5beffd8430b6b75088775614ed13980.tar.gz
gcc-f23d4b88f5beffd8430b6b75088775614ed13980.tar.bz2
ada: Fix crash on Ada.Containers with No_Dispatching_Calls restriction
This makes it so that the compiler does not crash and flags the underlying violation of the restriction instead. gcc/ada/ * exp_ch3.adb (Freeze_Type): Do not associate the Finalize_Address routine for a class-wide type if restriction No_Dispatching_Calls is in effect.
-rw-r--r--gcc/ada/exp_ch3.adb6
1 files changed, 5 insertions, 1 deletions
diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index 3631865..33e96a0 100644
--- a/gcc/ada/exp_ch3.adb
+++ b/gcc/ada/exp_ch3.adb
@@ -9251,9 +9251,13 @@ package body Exp_Ch3 is
-- this is indeed the case, associate the Finalize_Address routine
-- of the full view with the finalization masters of all pending
-- access types. This scenario applies to anonymous access types as
- -- well.
+ -- well. But the Finalize_Address routine is missing if the type is
+ -- class-wide and we are under restriction No_Dispatching_Calls, see
+ -- Expand_Freeze_Class_Wide_Type above for the rationale.
elsif Needs_Finalization (Typ)
+ and then (not Is_Class_Wide_Type (Typ)
+ or else not Restriction_Active (No_Dispatching_Calls))
and then Present (Pending_Access_Types (Typ))
then
E := First_Elmt (Pending_Access_Types (Typ));