diff mbox series

[COMMITTED] ada: Fix visibility error with DIC or Type_Invariant aspect on generic type

Message ID 20230530072029.2499524-1-poulhies@adacore.com
State Committed
Commit 3590b8e7850cc77324c0116718d3587401142d1c
Headers
Series [COMMITTED] ada: Fix visibility error with DIC or Type_Invariant aspect on generic type |

Commit Message

Marc Poulhiès May 30, 2023, 7:20 a.m. UTC 
  From: Eric Botcazou <ebotcazou@adacore.com>

The compiler fails to capture global references during the analysis of the
aspect on the generic type because it analyzes a copy of the expression.

gcc/ada/

	* exp_util.adb (Build_DIC_Procedure_Body.Add_Own_DIC): When inside
	a generic unit, preanalyze the expression directly.
	(Build_Invariant_Procedure_Body.Add_Own_Invariants): Likewise.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/exp_util.adb | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/gcc/ada/exp_util.adb b/gcc/ada/exp_util.adb
index 2582524b1dd..4c4844594d2 100644
--- a/gcc/ada/exp_util.adb
+++ b/gcc/ada/exp_util.adb
@@ -1853,7 +1853,15 @@  package body Exp_Util is
 
       begin
          pragma Assert (Present (DIC_Expr));
-         Expr := New_Copy_Tree (DIC_Expr);
+
+         --  We need to preanalyze the expression itself inside a generic to
+         --  be able to capture global references present in it.
+
+         if Inside_A_Generic then
+            Expr := DIC_Expr;
+         else
+            Expr := New_Copy_Tree (DIC_Expr);
+         end if;
 
          --  Perform the following substitution:
 
@@ -3111,7 +3119,14 @@  package body Exp_Util is
                   return;
                end if;
 
-               Expr := New_Copy_Tree (Prag_Expr);
+               --  We need to preanalyze the expression itself inside a generic
+               --  to be able to capture global references present in it.
+
+               if Inside_A_Generic then
+                  Expr := Prag_Expr;
+               else
+                  Expr := New_Copy_Tree (Prag_Expr);
+               end if;
 
                --  Substitute all references to type T with references to the
                --  _object formal parameter.