From: Piotr Trojanek <trojanek@adacore.com>
Date: Fri, 28 May 2021 13:32:16 +0000 (+0200)
Subject: [Ada] Reorder preanalysis of static expression functions
X-Git-Tag: basepoints/gcc-13~6116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81956c08f74be83aa61cba6c112b92cdc0198a66;p=thirdparty%2Fgcc.git

[Ada] Reorder preanalysis of static expression functions

gcc/ada/

	* sem_ch6.adb (Analyze_Expression_Function): Reorder code.
---

diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index 0ecac3fed4e9..d5432536846d 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -524,6 +524,12 @@ package body Sem_Ch6 is
             Install_Formals (Def_Id);
             Preanalyze_Spec_Expression (Expr, Typ);
             End_Scope;
+         else
+            Push_Scope (Def_Id);
+            Install_Formals (Def_Id);
+            Preanalyze_Formal_Expression (Expr, Typ);
+            Check_Limited_Return (Orig_N, Expr, Typ);
+            End_Scope;
          end if;
 
          --  If this is a wrapper created in an instance for a formal
@@ -561,16 +567,6 @@ package body Sem_Ch6 is
             end;
          end if;
 
-         --  Preanalyze the expression if not already done above
-
-         if not Inside_A_Generic then
-            Push_Scope (Def_Id);
-            Install_Formals (Def_Id);
-            Preanalyze_Formal_Expression (Expr, Typ);
-            Check_Limited_Return (Orig_N, Expr, Typ);
-            End_Scope;
-         end if;
-
          --  In the case of an expression function marked with the aspect
          --  Static, we need to check the requirement that the function's
          --  expression is a potentially static expression. This is done