diff mbox series

[COMMITTED] ada: Reduce scope in the analysis of access attributes

Message ID 20240507080031.37807-1-poulhies@adacore.com
State Committed
Headers
Series [COMMITTED] ada: Reduce scope in the analysis of access attributes |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm fail Patch failed to apply
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 fail Patch failed to apply

Commit Message

Marc Poulhiès May 7, 2024, 8 a.m. UTC 
  From: Piotr Trojanek <trojanek@adacore.com>

Code cleanup; semantics is unaffected.

gcc/ada/

	* sem_attr.adb (Analyze_Access_Attribute): Move code to IF
	branch where its result is used.

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

---
 gcc/ada/sem_attr.adb | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/gcc/ada/sem_attr.adb b/gcc/ada/sem_attr.adb
index c17f67356ef..6140cc0c0d6 100644
--- a/gcc/ada/sem_attr.adb
+++ b/gcc/ada/sem_attr.adb
@@ -982,15 +982,16 @@  package body Sem_Attr is
          if Is_Entity_Name (P) then
             Typ := Entity (P);
 
-            --  The reference may appear in an aggregate that has been expanded
-            --  into a loop. Locate scope of type definition, if any.
+            if Is_Type (Typ) then
 
-            Scop := Current_Scope;
-            while Ekind (Scop) = E_Loop loop
-               Scop := Scope (Scop);
-            end loop;
+               --  The reference may appear in an aggregate that has been
+               --  expanded into a loop. Locate scope of type definition,
+               --  if any.
 
-            if Is_Type (Typ) then
+               Scop := Current_Scope;
+               while Ekind (Scop) = E_Loop loop
+                  Scop := Scope (Scop);
+               end loop;
 
                --  OK if we are within the scope of a limited type
                --  let's mark the component as having per object constraint