From dad94b3aca12f25cd2b3f6c32b7e55d69c8c4ad6 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 9 Apr 2020 12:56:01 +0200 Subject: [PATCH] [Ada] Fix spurious error on derived private type with predicate 2020-06-16 Eric Botcazou gcc/ada/ * sem_ch4.adb (Common_Type): Go to Underlying_Full_View, if any. --- gcc/ada/sem_ch4.adb | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb index 92c5a7ac636..bc841c0c6f8 100644 --- a/gcc/ada/sem_ch4.adb +++ b/gcc/ada/sem_ch4.adb @@ -3291,20 +3291,30 @@ package body Sem_Ch4 is T2 : Entity_Id) return Boolean is function Common_Type (T : Entity_Id) return Entity_Id; - -- Find non-private full view if any, without going to ancestor type - -- (as opposed to Underlying_Type). + -- Find non-private underlying full view if any, without going to + -- ancestor type (as opposed to Underlying_Type). ----------------- -- Common_Type -- ----------------- function Common_Type (T : Entity_Id) return Entity_Id is + CT : Entity_Id; + begin - if Is_Private_Type (T) and then Present (Full_View (T)) then - return Base_Type (Full_View (T)); - else - return Base_Type (T); + CT := T; + + if Is_Private_Type (CT) and then Present (Full_View (CT)) then + CT := Full_View (CT); end if; + + if Is_Private_Type (CT) + and then Present (Underlying_Full_View (CT)) + then + CT := Underlying_Full_View (CT); + end if; + + return Base_Type (CT); end Common_Type; -- Start of processing for Compatible_Types_In_Predicate -- 2.30.2