aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPiotr Trojanek <trojanek@adacore.com>2022-06-07 13:19:35 +0200
committerPierre-Marie de Rodat <derodat@adacore.com>2022-07-05 08:28:19 +0000
commit0aa855e5eb274a7279693879b45b73b28b72aaef (patch)
tree29e8cd186354fd516142da0ca4f25966ce2a0774 /gcc
parent95e2844ef8fa68f7abd45646bae8b4362614bf9c (diff)
downloadgcc-0aa855e5eb274a7279693879b45b73b28b72aaef.zip
gcc-0aa855e5eb274a7279693879b45b73b28b72aaef.tar.gz
gcc-0aa855e5eb274a7279693879b45b73b28b72aaef.tar.bz2
[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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/exp_ch3.adb8
-rw-r--r--gcc/ada/exp_prag.adb8
2 files changed, 6 insertions, 10 deletions
diff --git a/gcc/ada/exp_ch3.adb b/gcc/ada/exp_ch3.adb
index eea37dc..c9f0bfd 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 5f13087..0631172 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;