From: Piotr Trojanek <trojanek@adacore.com>
Date: Thu, 8 Apr 2021 19:17:33 +0000 (+0200)
Subject: [Ada] Reuse Is_Subprogram_Or_Entry where possible
X-Git-Tag: basepoints/gcc-13~6425
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df3636e013f276a0d1fde5b6da1f504b748696db;p=thirdparty%2Fgcc.git

[Ada] Reuse Is_Subprogram_Or_Entry where possible

gcc/ada/

	* freeze.adb (Freeze_All): Simplify by reusing
	Is_Subprogram_Or_Entry.
	* sem_ch11.adb (Analyze_Handled_Statement): Likewise.
---

diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb
index 3ea4a99b84d1..81e0e87d4d1a 100644
--- a/gcc/ada/freeze.adb
+++ b/gcc/ada/freeze.adb
@@ -2179,7 +2179,7 @@ package body Freeze is
          elsif Is_Concurrent_Type (E) then
             Item := First_Entity (E);
             while Present (Item) loop
-               if (Is_Entry (Item) or else Is_Subprogram (Item))
+               if Is_Subprogram_Or_Entry (Item)
                  and then not Default_Expressions_Processed (Item)
                then
                   Process_Default_Expressions (Item, After);
diff --git a/gcc/ada/sem_ch11.adb b/gcc/ada/sem_ch11.adb
index 5a2c6a6828bb..2af65ae2f836 100644
--- a/gcc/ada/sem_ch11.adb
+++ b/gcc/ada/sem_ch11.adb
@@ -435,7 +435,7 @@ package body Sem_Ch11 is
       --  postcondition, since in that case there are no source references, and
       --  we need to preserve deferred references from the enclosing scope.
 
-      if ((Is_Subprogram (Current_Scope) or else Is_Entry (Current_Scope))
+      if (Is_Subprogram_Or_Entry (Current_Scope)
            and then Chars (Current_Scope) /= Name_uPostconditions)
          or else Ekind (Current_Scope) in E_Block | E_Task_Type
       then