diff mbox series

[COMMITTED] ada: Fix crash on Ada.Containers with No_Dispatching_Calls restriction

Message ID 20230522085001.1725965-1-poulhies@adacore.com
State Accepted
Headers
Series [COMMITTED] ada: Fix crash on Ada.Containers with No_Dispatching_Calls restriction |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Marc Poulhiès May 22, 2023, 8:50 a.m. UTC 
  From: Eric Botcazou <ebotcazou@adacore.com>

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.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/exp_ch3.adb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index 363186565f6..33e96a0ff90 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));