From dfe93fd5f5a5e271d7f3b03984f837d8597ee3bf Mon Sep 17 00:00:00 2001 From: Piotr Trojanek Date: Mon, 26 Jul 2021 23:16:13 +0200 Subject: [PATCH] [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. --- gcc/ada/exp_ch4.adb | 3 +-- gcc/ada/exp_prag.adb | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gcc/ada/exp_ch4.adb b/gcc/ada/exp_ch4.adb index d7037bf..a4ed3a2 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 55842f7..27b4e7d 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)); -- 2.7.4