diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2022-06-07 21:46:04 +0200 |
|---|---|---|
| committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2022-07-06 13:29:49 +0000 |
| commit | 1141fbd71ea1782c6eac750cfed809f0706aaafc (patch) | |
| tree | 45caefd943d0502d4ab25014c1459a99b77d19cc /gcc/ada/gcc-interface/trans.cc | |
| parent | 40242ebb71ed7a03ab23349a893afe6140c512d1 (diff) | |
| download | gcc-1141fbd71ea1782c6eac750cfed809f0706aaafc.zip gcc-1141fbd71ea1782c6eac750cfed809f0706aaafc.tar.gz gcc-1141fbd71ea1782c6eac750cfed809f0706aaafc.tar.bz2 | |
[Ada] Improve code generated for aggregates of VFA type
This avoids using a full access for constants internally generated from
assignments of aggregates with a Volatile_Full_Access type.
gcc/ada/
* gcc-interface/gigi.h (simple_constant_p): Declare.
* gcc-interface/decl.cc (gnat_to_gnu_entity) <E_Variable>: Strip
the qualifiers from the type of a simple constant.
(simple_constant_p): New predicate.
* gcc-interface/trans.cc (node_is_atomic): Return true for objects
with atomic type except for simple constants.
(node_is_volatile_full_access): Return false for simple constants
with VFA type.
Diffstat (limited to 'gcc/ada/gcc-interface/trans.cc')
| -rw-r--r-- | gcc/ada/gcc-interface/trans.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc index 758df38..aec27e1 100644 --- a/gcc/ada/gcc-interface/trans.cc +++ b/gcc/ada/gcc-interface/trans.cc @@ -4111,9 +4111,11 @@ node_is_atomic (Node_Id gnat_node) case N_Identifier: case N_Expanded_Name: gnat_entity = Entity (gnat_node); - if (Ekind (gnat_entity) != E_Variable) + if (!Is_Object (gnat_entity)) break; - return Is_Atomic (gnat_entity) || Is_Atomic (Etype (gnat_entity)); + return Is_Atomic (gnat_entity) + || (Is_Atomic (Etype (gnat_entity)) + && !simple_constant_p (gnat_entity)); case N_Selected_Component: return Is_Atomic (Etype (gnat_node)) @@ -4152,7 +4154,8 @@ node_is_volatile_full_access (Node_Id gnat_node) if (!Is_Object (gnat_entity)) break; return Is_Volatile_Full_Access (gnat_entity) - || Is_Volatile_Full_Access (Etype (gnat_entity)); + || (Is_Volatile_Full_Access (Etype (gnat_entity)) + && !simple_constant_p (gnat_entity)); case N_Selected_Component: return Is_Volatile_Full_Access (Etype (gnat_node)) |