From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 71D0D3858410; Wed, 22 Sep 2021 15:12:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 71D0D3858410 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-3820] [Ada] Reuse routines for detecting attributes Old and Result X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: 03b6cc3b3e60379f10a4b055e431488ab10a1760 X-Git-Newrev: dfe93fd5f5a5e271d7f3b03984f837d8597ee3bf Message-Id: <20210922151201.71D0D3858410@sourceware.org> Date: Wed, 22 Sep 2021 15:12:01 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Sep 2021 15:12:01 -0000 https://gcc.gnu.org/g:dfe93fd5f5a5e271d7f3b03984f837d8597ee3bf commit r12-3820-gdfe93fd5f5a5e271d7f3b03984f837d8597ee3bf Author: Piotr Trojanek Date: Mon Jul 26 23:16:13 2021 +0200 [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: --- 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 d7037bf37f2..a4ed3a2d1ca 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 55842f70f57..27b4e7df571 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));