From e2b07ba054daa896795e0932626f259c87417ec0 Mon Sep 17 00:00:00 2001 From: Javier Miranda Date: Mon, 20 Dec 2021 11:51:44 +0000 Subject: [PATCH] [Ada] Spurious error caused by order of interfaces in full view gcc/ada/ * sem_ch3.adb (Reorder_Interfaces): When the conflicting interface is identified we just replace the interface in the list of interfaces of the tagged type (instead of adding a duplicate to the list of interfaces). --- gcc/ada/sem_ch3.adb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index ce5f4536a26..bd51c5b3337 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -17272,7 +17272,6 @@ package body Sem_Ch3 is -- append the full view's original parent to the interface list, -- recursively call Derived_Type_Definition on the full type, and -- return True. If a match is not found, return False. - -- ??? This seems broken in the case of generic packages. ------------------------ -- Reorder_Interfaces -- @@ -17281,6 +17280,7 @@ package body Sem_Ch3 is function Reorder_Interfaces return Boolean is Iface : Node_Id; New_Iface : Node_Id; + begin Iface := First (Interface_List (Def)); while Present (Iface) loop @@ -17290,7 +17290,7 @@ package body Sem_Ch3 is New_Iface := Make_Identifier (Sloc (N), Chars (Parent_Type)); - Append (New_Iface, Interface_List (Def)); + Rewrite (Iface, New_Iface); -- Analyze the transformed code -- 2.11.4.GIT