From: Piotr Trojanek <trojanek@adacore.com>
Date: Tue, 7 Jun 2022 11:19:35 +0000 (+0200)
Subject: [Ada] Reuse Get_Pragma_Arg to handle pragma argument associations
X-Git-Tag: basepoints/gcc-14~5717
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0aa855e5eb274a7279693879b45b73b28b72aaef;p=thirdparty%2Fgcc.git

[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 --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;