From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 795F0385C311; Tue, 5 Jul 2022 08:30:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 795F0385C311 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 r13-1490] [Ada] Reuse Get_Pragma_Arg to handle pragma argument associations X-Act-Checkin: gcc X-Git-Author: Piotr Trojanek X-Git-Refname: refs/heads/master X-Git-Oldrev: 95e2844ef8fa68f7abd45646bae8b4362614bf9c X-Git-Newrev: 0aa855e5eb274a7279693879b45b73b28b72aaef Message-Id: <20220705083044.795F0385C311@sourceware.org> Date: Tue, 5 Jul 2022 08:30:44 +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: Tue, 05 Jul 2022 08:30:44 -0000 https://gcc.gnu.org/g:0aa855e5eb274a7279693879b45b73b28b72aaef commit r13-1490-g0aa855e5eb274a7279693879b45b73b28b72aaef Author: Piotr Trojanek Date: Tue Jun 7 13:19:35 2022 +0200 [Ada] Reuse Get_Pragma_Arg to handle pragma argument associations Code cleanup related to looking at pragma Thread_Local_Storage. Semantics is unaffected. gcc/ada/ * exp_ch3.adb (Build_Init_Statements): Reuse Get_Pragma_Arg. * exp_prag.adb (Arg_N): Likewise. Diff: --- gcc/ada/exp_ch3.adb | 8 +++----- gcc/ada/exp_prag.adb | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb index eea37dcf9da..c9f0bfd9302 100644 --- a/gcc/ada/exp_ch3.adb +++ b/gcc/ada/exp_ch3.adb @@ -3319,11 +3319,9 @@ package body Exp_Ch3 is -- Pragma case if Nkind (Ritem) = N_Pragma then - Exp := First (Pragma_Argument_Associations (Ritem)); - - if Nkind (Exp) = N_Pragma_Argument_Association then - Exp := Expression (Exp); - end if; + Exp := + Get_Pragma_Arg + (First (Pragma_Argument_Associations (Ritem))); -- Conversion for Priority expression diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb index 5f1308777e8..0631172ea18 100644 --- a/gcc/ada/exp_prag.adb +++ b/gcc/ada/exp_prag.adb @@ -105,12 +105,10 @@ package body Exp_Prag is end if; end loop; - if Present (Arg) - and then Nkind (Arg) = N_Pragma_Argument_Association - then - return Expression (Arg); + if Present (Arg) then + return Get_Pragma_Arg (Arg); else - return Arg; + return Empty; end if; end Arg_N;