From: Steve Baird <ba...@adacore.com>
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.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/sem_prag.adb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 6b1f9263f9d..36c1add5ea4 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
--
2.40.0
