From 767f9cb1f81bdeb55a7b5fbbccb3c057f37e2fae Mon Sep 17 00:00:00 2001 From: Ghjuvan Lacambre Date: Thu, 22 Apr 2021 17:13:19 +0200 Subject: [PATCH] [Ada] Fix overriding subprogram being incorrectly seen as returning gcc/ada/ * sem_ch3.adb (Check_Abstract_Overriding): Check for renamings. --- gcc/ada/sem_ch3.adb | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb index 7dfb5c8..7a24298 100644 --- a/gcc/ada/sem_ch3.adb +++ b/gcc/ada/sem_ch3.adb @@ -11149,12 +11149,28 @@ package body Sem_Ch3 is if Present (Overridden_Operation (Subp)) and then No_Return (Overridden_Operation (Subp)) - and then not No_Return (Subp) then - Error_Msg_N ("overriding subprogram & must be No_Return", Subp); - Error_Msg_N - ("\since overridden subprogram is No_Return (RM 6.5.1(6/2))", - Subp); + + -- If the subprogram is a renaming, check that the renamed + -- subprogram is No_Return. + + if Present (Renamed_Or_Alias (Subp)) then + if not No_Return (Renamed_Or_Alias (Subp)) then + Error_Msg_N ("subprogram & must be No_Return", + Renamed_Or_Alias (Subp)); + Error_Msg_N ("\since renaming & overrides No_Return " + & "subprogram (RM 6.5.1(6/2))", + Subp); + end if; + + -- Make sure that the subprogram itself is No_Return. + + elsif not No_Return (Subp) then + Error_Msg_N ("overriding subprogram & must be No_Return", Subp); + Error_Msg_N + ("\since overridden subprogram is No_Return (RM 6.5.1(6/2))", + Subp); + end if; end if; -- If the operation is a wrapper for a synchronized primitive, it -- 2.7.4