public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r13-1638] [Ada] Fix confusing error expression on an unknown restriction
@ 2022-07-12 12:26 Pierre-Marie de Rodat
  0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2022-07-12 12:26 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:7e5a0317adbf1c9bc2ee5f6446bd161854c03373

commit r13-1638-g7e5a0317adbf1c9bc2ee5f6446bd161854c03373
Author: Piotr Trojanek <trojanek@adacore.com>
Date:   Thu Jun 23 13:09:51 2022 +0200

    [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:
---
 gcc/ada/sem_prag.adb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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;


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-07-12 12:26 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-12 12:26 [gcc r13-1638] [Ada] Fix confusing error expression on an unknown restriction Pierre-Marie de Rodat

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).