From: Piotr Trojanek <trojanek@adacore.com>
Date: Thu, 23 Jun 2022 11:09:51 +0000 (+0200)
Subject: [Ada] Fix confusing error expression on an unknown restriction
X-Git-Tag: basepoints/gcc-14~5569
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e5a0317adbf1c9bc2ee5f6446bd161854c03373;p=thirdparty%2Fgcc.git

[Ada] Fix confusing error expression on an unknown restriction

When pragma Restriction is used with an unknown restriction identifier,
it is better to not process the restriction expression, as it will
likely produce confusing error message.

In particular, an odd message appeared when there was a typo in the
restriction identifier whose expression requires special processing
(e.g.  No_Dependence_On instead of No_Dependence).

gcc/ada/

	* sem_prag.adb (Process_Restrictions_Or_Restriction_Warnings):
	Do not process expression of unknown restrictions.
---

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index a24d19eacbb..35910400cf9 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -10792,13 +10792,15 @@ package body Sem_Prag is
 
             else
                R_Id := Get_Restriction_Id (Process_Restriction_Synonyms (Arg));
-               Analyze_And_Resolve (Expr, Any_Integer);
 
                if R_Id not in All_Parameter_Restrictions then
                   Error_Pragma_Arg
                     ("invalid restriction parameter identifier", Arg);
+               end if;
+
+               Analyze_And_Resolve (Expr, Any_Integer);
 
-               elsif not Is_OK_Static_Expression (Expr) then
+               if not Is_OK_Static_Expression (Expr) then
                   Flag_Non_Static_Expr
                     ("value must be static expression!", Expr);
                   raise Pragma_Exit;