From: Steve Baird Date: Mon, 30 Jan 2023 23:41:48 +0000 (-0800) Subject: ada: Better error message if non-Ada2022 code declares No_Return function X-Git-Tag: basepoints/gcc-15~9100 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1f5cf0b14c460f04e878e8c52c90132f19c5e3f;p=thirdparty%2Fgcc.git ada: Better error message if non-Ada2022 code declares No_Return function When a feature that is legal in Ada2022 but not in earlier Ada versions is used, we typically want to call Error_Msg_Ada_2022_Feature in order to generate an informative message in the error case. Specifying No_Return for a function (as opposed to a procedure) is no exception to this rule. gcc/ada/ * sem_prag.adb (Analyze_Pragma): In Check_No_Return, call Error_Msg_Ada_2022_Feature in the case of a function. Remove code outside of Check_No_Return that was querying Ada_Version. --- diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 6b1f9263f9db..36c1add5ea48 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -20035,7 +20035,11 @@ package body Sem_Prag is N : Node_Id) return Boolean is begin - if Ekind (E) = E_Procedure then + if Ekind (E) in E_Function | E_Generic_Function then + Error_Msg_Ada_2022_Feature ("No_Return function", Sloc (N)); + return Ada_Version >= Ada_2022; + + elsif Ekind (E) = E_Procedure then -- If E is a generic instance, marking it with No_Return -- is forbidden, but having it inherit the No_Return of @@ -20106,9 +20110,7 @@ package body Sem_Prag is -- Ada 2022 (AI12-0269): A function can be No_Return if Ekind (E) in E_Generic_Procedure | E_Procedure - or else (Ada_Version >= Ada_2022 - and then - Ekind (E) in E_Generic_Function | E_Function) + | E_Generic_Function | E_Function then -- Check that the pragma is not applied to a body. -- First check the specless body case, to give a