[Ada] Small consistency fix for Volatile_Full_Access objects

Message ID 20191216103825.GA39354@adacore.com
State New
Headers show
Series
  • [Ada] Small consistency fix for Volatile_Full_Access objects
Related show

Commit Message

Pierre-Marie de Rodat Dec. 16, 2019, 10:38 a.m.
This fixes a small oversight in the part of the Is_Atomic_Or_VFA_Object
predicate which detects the Volatile_Full_Access aspect/pragma.  This
aspect/pragma can also be put on individual components in record types
and, more generally, components of arrays or records whose type is
subject to the aspect/pragma are Volatile_Full_Access objects too.

This is simply modelled on the Is_Atomic_Object predicate, modulo the
handling of Atomic_Components whose counterpart doesn't exist for the
Volatile_Full_Access aspect/pragma.

Tested on x86_64-pc-linux-gnu, committed on trunk

2019-12-16  Eric Botcazou  <ebotcazou@adacore.com>

gcc/ada/

	* sem_util.adb (Is_Atomic_Or_VFA_Object): Also return true for
	components whose type is Volatile_Full_Access or which are
	subject to the aspect/pragma individually.
	* sem_util.ads (Is_Atomic_Object_Entity): Small comment fix.

Patch

--- gcc/ada/sem_util.adb
+++ gcc/ada/sem_util.adb
@@ -13788,13 +13788,50 @@  package body Sem_Util is
    -----------------------------
 
    function Is_Atomic_Or_VFA_Object (N : Node_Id) return Boolean is
+      function Is_VFA_Object (N : Node_Id) return Boolean;
+      --  Determine whether arbitrary node N denotes a reference to an object
+      --  which is Volatile_Full_Access. Modelled on Is_Atomic_Object above.
+
+      function Is_VFA_Object_Entity (Id : Entity_Id) return Boolean;
+      --  Determine whether arbitrary entity Id denotes an object which is
+      --  Volatile_Full_Access. Modelled on Is_Atomic_Object_Entity above.
+
+      ---------------------
+      --  Is_VFA_Object  --
+      ---------------------
+
+      function Is_VFA_Object (N : Node_Id) return Boolean is
+      begin
+         if Is_Entity_Name (N) then
+            return Is_VFA_Object_Entity (Entity (N));
+
+         elsif Nkind (N) = N_Indexed_Component then
+            return Is_Volatile_Full_Access (Etype (N));
+
+         elsif Nkind (N) = N_Selected_Component then
+            return
+              Is_Volatile_Full_Access (Etype (N))
+                or else Is_Volatile_Full_Access (Entity (Selector_Name (N)));
+         end if;
+
+         return False;
+      end Is_VFA_Object;
+
+      ----------------------------
+      --  Is_VFA_Object_Entity  --
+      ----------------------------
+
+      function Is_VFA_Object_Entity (Id : Entity_Id) return Boolean is
+      begin
+         return
+           Is_Object (Id)
+             and then (Is_Volatile_Full_Access (Id)
+                         or else
+                       Is_Volatile_Full_Access (Etype (Id)));
+      end Is_VFA_Object_Entity;
+
    begin
-      return Is_Atomic_Object (N)
-        or else (Is_Entity_Name (N)
-                   and then Is_Object (Entity (N))
-                   and then (Is_Volatile_Full_Access (Entity (N))
-                                or else
-                             Is_Volatile_Full_Access (Etype (Entity (N)))));
+      return Is_Atomic_Object (N) or else Is_VFA_Object (N);
    end Is_Atomic_Or_VFA_Object;
 
    ----------------------

--- gcc/ada/sem_util.ads
+++ gcc/ada/sem_util.ads
@@ -1535,7 +1535,7 @@  package Sem_Util is
 
    function Is_Atomic_Object_Entity (Id : Entity_Id) return Boolean;
    --  Determine whether arbitrary entity Id denotes an atomic object as per
-   --  Ada RM C.6(12).
+   --  Ada RM C.6(7).
 
    function Is_Atomic_Or_VFA_Object (N : Node_Id) return Boolean;
    --  Determine whether arbitrary node N denotes a reference to an object