From: Piotr Trojanek <trojanek@adacore.com>
Date: Wed, 21 Aug 2019 08:29:56 +0000 (+0000)
Subject: [Ada] Do not rewrite argument of pragma Entry_Queue_Length in analysis
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92ef57728eeec64cbe2c83cee3409466e3c98448;p=gcc.git

[Ada] Do not rewrite argument of pragma Entry_Queue_Length in analysis

It was unusual for the analysis phase of compiler to rewrite static
expression of pragma Entry_Queue_Length with its value. This typically
happens when expanding the AST and only if needed for a given backend.
In particular, GNATprove doesn't need such an expansion and actually
needs the unrewritten AST to detect references to constants declared
with SPARK_Mode => Off within a code with SPARK_Mode => On.

This change has no impact on compilation, so no frontend test is
provided.

2019-08-21  Piotr Trojanek  <trojanek@adacore.com>

gcc/ada/

	* sem_prag.adb (Max_Entry_Queue_Length): Do not substitute
	expression of the pragma argument with its value during
	analysis.
	* sem_util.adb (Get_Max_Queue_Length): Compute value of the
	pragma argument when needed.

From-SVN: r274781
---

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index e422ee771da..1a2ccbc65a9 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2019-08-21  Piotr Trojanek  <trojanek@adacore.com>
+
+	* sem_prag.adb (Max_Entry_Queue_Length): Do not substitute
+	expression of the pragma argument with its value during
+	analysis.
+	* sem_util.adb (Get_Max_Queue_Length): Compute value of the
+	pragma argument when needed.
+
 2019-08-21  Yannick Moy  <moy@adacore.com>
 
 	* checks.adb (Install_Null_Excluding_Check): Do not install
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 4ec8611fccf..5a561ea64b2 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -19599,15 +19599,6 @@ package body Sem_Prag is
 
             end if;
 
-            --  Manually substitute the expression value of the pragma argument
-            --  if it's not an integer literal because this is not taken care
-            --  of automatically elsewhere.
-
-            if Nkind (Arg) /= N_Integer_Literal then
-               Rewrite (Arg, Make_Integer_Literal (Sloc (Arg), Val));
-               Set_Etype (Arg, Etype (Original_Node (Arg)));
-            end if;
-
             Record_Rep_Item (Entry_Id, N);
          end Max_Entry_Queue_Length;
 
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index 58b7b0864ee..86ae740b686 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -9763,7 +9763,8 @@ package body Sem_Util is
          return Uint_0;
       end if;
 
-      Max := Intval (Expression (First (Pragma_Argument_Associations (Prag))));
+      Max := Expr_Value
+        (Expression (First (Pragma_Argument_Associations (Prag))));
 
       --  Since -1 and 0 are equivalent, return 0 for instances of -1 for
       --  uniformity.