From: Piotr Trojanek <trojanek@adacore.com>
Date: Mon, 26 Jul 2021 21:16:13 +0000 (+0200)
Subject: [Ada] Reuse routines for detecting attributes Old and Result
X-Git-Tag: basepoints/gcc-13~4493
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfe93fd5f5a5e271d7f3b03984f837d8597ee3bf;p=thirdparty%2Fgcc.git

[Ada] Reuse routines for detecting attributes Old and Result

gcc/ada/

	* exp_ch4.adb (Expand_N_Op_Eq): Reuse Is_Attribute_Result.
	* exp_prag.adb (Expand_Attributes): Reuse Is_Attribute_Old.
---

diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb
index d7037bf37f2e..a4ed3a2d1cae 100644
--- a/gcc/ada/exp_ch4.adb
+++ b/gcc/ada/exp_ch4.adb
@@ -8609,8 +8609,7 @@ package body Exp_Ch4 is
       --  f'Machine (expr) to eliminate surprise from extra precision.
 
       if Is_Floating_Point_Type (Typl)
-        and then Nkind (Original_Node (Lhs)) = N_Attribute_Reference
-        and then Attribute_Name (Original_Node (Lhs)) = Name_Result
+        and then Is_Attribute_Result (Original_Node (Lhs))
       then
          --  Stick in the Typ'Machine call if not already there
 
diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb
index 55842f70f579..27b4e7df571d 100644
--- a/gcc/ada/exp_prag.adb
+++ b/gcc/ada/exp_prag.adb
@@ -1525,9 +1525,7 @@ package body Exp_Prag is
          begin
             --  Attribute 'Old
 
-            if Nkind (N) = N_Attribute_Reference
-              and then Attribute_Name (N) = Name_Old
-            then
+            if Is_Attribute_Old (N) then
                Pref := Prefix (N);
 
                Indirect := Indirect_Temp_Needed (Etype (Pref));