From 88fd22e721c32580610d1756701cef892e713ad8 Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Wed, 9 Dec 2020 14:44:00 +0100 Subject: [PATCH] [Ada] Consistent diagnostic on missing -gnat2020 switch for aspects gcc/ada/ * sem_ch13.adb (Analyze_Aspect_Static): Reuse Error_Msg_Ada_2020_Feature for aspect Static. (Analyze_One_Aspect): Likewise for aspect Full_Access. --- gcc/ada/sem_ch13.adb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 25e3bd7..6af3238 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -2500,10 +2500,7 @@ package body Sem_Ch13 is begin if Ada_Version < Ada_2020 then - Error_Msg_N - ("aspect % is an Ada 202x feature", Aspect); - Error_Msg_N ("\compile with -gnat2020", Aspect); - + Error_Msg_Ada_2020_Feature ("aspect %", Sloc (Aspect)); return; end if; @@ -4575,11 +4572,7 @@ package body Sem_Ch13 is -- Ada 202x (AI12-0363): Full_Access_Only elsif A_Id = Aspect_Full_Access_Only then - if Ada_Version < Ada_2020 then - Error_Msg_N - ("aspect % is an Ada 202x feature", Aspect); - Error_Msg_N ("\compile with -gnat2020", Aspect); - end if; + Error_Msg_Ada_2020_Feature ("aspect %", Sloc (Aspect)); -- Ada 202x (AI12-0075): static expression functions -- 2.7.4