From: Piotr Trojanek <trojanek@adacore.com>
Date: Mon, 6 Feb 2023 21:56:49 +0000 (+0100)
Subject: ada: Cleanup redundant condition in resolution of entity names
X-Git-Tag: basepoints/gcc-15~9084
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=012de9f65cb9e4a6a4bf78aea7634118a74013e4;p=thirdparty%2Fgcc.git

ada: Cleanup redundant condition in resolution of entity names

Code cleanup related to new contract for SPARK; semantics is unaffected.

gcc/ada/

	* sem_res.adb (Resolve_Entity_Name): Combine two IF statements that
	execute code only for references that come from source.
---

diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index 3eb13de38dff..365c75041a94 100644
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -8022,7 +8022,7 @@ package body Sem_Res is
 
       if Comes_From_Source (N) then
 
-         --  The following checks are only relevant when SPARK_Mode is on as
+         --  The following checks are only relevant when SPARK_Mode is On as
          --  they are not standard Ada legality rules.
 
          if SPARK_Mode = On then
@@ -8067,13 +8067,11 @@ package body Sem_Res is
          if Is_Ghost_Entity (E) then
             Check_Ghost_Context (E, N);
          end if;
-      end if;
 
-      --  We may be resolving an entity within expanded code, so a reference to
-      --  an entity should be ignored when calculating effective use clauses to
-      --  avoid inappropriate marking.
+         --  We may be resolving an entity within expanded code, so a reference
+         --  to an entity should be ignored when calculating effective use
+         --  clauses to avoid inappropriate marking.
 
-      if Comes_From_Source (N) then
          Mark_Use_Clauses (E);
       end if;
    end Resolve_Entity_Name;