From: Piotr Trojanek <trojanek@adacore.com>
Date: Wed, 19 May 2021 10:07:42 +0000 (+0200)
Subject: [Ada] Reduce scope of local variables
X-Git-Tag: basepoints/gcc-13~6201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f78c17d267271cf339e4a0efc3bfe7eb0c00b502;p=thirdparty%2Fgcc.git

[Ada] Reduce scope of local variables

gcc/ada/

	* sem_ch6.adb (Check_For_Primitive_Subprogram): Move
	declarations of local variables after nested subprogram bodies.
---

diff --git a/gcc/ada/sem_ch6.adb b/gcc/ada/sem_ch6.adb
index b0db7fe0939f..75e5a99c1324 100644
--- a/gcc/ada/sem_ch6.adb
+++ b/gcc/ada/sem_ch6.adb
@@ -11018,10 +11018,6 @@ package body Sem_Ch6 is
         (Is_Primitive  : out Boolean;
          Is_Overriding : Boolean := False)
       is
-         Formal : Entity_Id;
-         F_Typ  : Entity_Id;
-         B_Typ  : Entity_Id;
-
          procedure Add_Or_Replace_Untagged_Primitive (Typ : Entity_Id);
          --  Either add the new subprogram to the list of primitives for
          --  untagged type Typ, or if it overrides a primitive of Typ, then
@@ -11270,6 +11266,12 @@ package body Sem_Ch6 is
             end if;
          end Visible_Part_Type;
 
+         --  Local variables
+
+         Formal : Entity_Id;
+         F_Typ  : Entity_Id;
+         B_Typ  : Entity_Id;
+
       --  Start of processing for Check_For_Primitive_Subprogram
 
       begin