diff mbox series

[COMMITTED] ada: Fix assertion failure introduced by latest change

Message ID 20230718131329.81009-1-poulhies@adacore.com
State Unresolved
Headers
Series [COMMITTED] ada: Fix assertion failure introduced by latest change |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Marc Poulhiès July 18, 2023, 1:13 p.m. UTC 
  From: Eric Botcazou <ebotcazou@adacore.com>

The new processing is not properly guarded.

gcc/ada/

	* sem_ch13.adb (Replace_Type_References_Generic.Visible_Component):
	In the case of private discriminated types, explicitly check that we
	have a private declaration before examining its discriminant part.

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

---
 gcc/ada/sem_ch13.adb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 4f97094aae5..585c0f33d8b 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -15593,8 +15593,6 @@  package body Sem_Ch13 is
          elsif Is_Private_Type (T) and then Has_Discriminants (T) then
             declare
                Decl : constant Node_Id := Declaration_Node (T);
-               Spec : constant List_Id :=
-                 Discriminant_Specifications (Original_Node (Decl));
 
                Discr : Node_Id;
 
@@ -15604,8 +15602,11 @@  package body Sem_Ch13 is
                --  name; then, if it exists, return the discriminant entity of
                --  the same name in the type, which is that of its full view.
 
-               if Present (Spec) then
-                  Discr := First (Spec);
+               if Nkind (Decl) in N_Private_Extension_Declaration
+                                | N_Private_Type_Declaration
+                 and then Present (Discriminant_Specifications (Decl))
+               then
+                  Discr := First (Discriminant_Specifications (Decl));
 
                   while Present (Discr) loop
                      if Chars (Defining_Identifier (Discr)) = Comp then