[COMMITTED] ada: Fix storage model handling for dereference as lvalue and renamings

Message ID 20230530072105.2500303-1-poulhies@adacore.com
State Accepted
Headers
Series [COMMITTED] ada: Fix storage model handling for dereference as lvalue and renamings |

Checks

Context Check Description
snail/gcc-patch-check success Github commit url

Commit Message

Marc Poulhiès May 30, 2023, 7:21 a.m. UTC
  Don't require storage access for explicit dereferences used as
lvalue (e.g. Some_Access.all'Address) or for renamings.

gcc/ada/

	* gcc-interface/trans.cc (get_storage_model_access): Don't require
	storage model access for dereference used as lvalue or renamings.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/gcc-interface/trans.cc | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)
  

Patch

diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc
index 13f438c424b..f4a5db002f4 100644
--- a/gcc/ada/gcc-interface/trans.cc
+++ b/gcc/ada/gcc-interface/trans.cc
@@ -4398,14 +4398,32 @@  static void
 get_storage_model_access (Node_Id gnat_node, Entity_Id *gnat_smo)
 {
   const Node_Id gnat_parent = Parent (gnat_node);
+  *gnat_smo = Empty;
 
-  /* If we are the prefix of the parent, then the access is above us.  */
-  if (node_is_component (gnat_parent) && Prefix (gnat_parent) == gnat_node)
+  switch (Nkind (gnat_parent))
     {
-      *gnat_smo = Empty;
+    case N_Attribute_Reference:
+      /* If the parent is an attribute reference that requires an lvalue and
+         gnat_node is the Prefix (i.e. not a parameter), we do not need to
+         actually access any storage. */
+      if (lvalue_required_for_attribute_p (gnat_parent)
+          && Prefix (gnat_parent) == gnat_node)
+        return;
+      break;
+
+    case N_Object_Renaming_Declaration:
+      /* Nothing to do for the identifier in an object renaming declaration,
+         the renaming itself does not need storage model access. */
       return;
+
+    default:
+      break;
     }
 
+  /* If we are the prefix of the parent, then the access is above us.  */
+  if (node_is_component (gnat_parent) && Prefix (gnat_parent) == gnat_node)
+    return;
+
   /* Now strip any type conversion from GNAT_NODE.  */
   if (Nkind (gnat_node) == N_Type_Conversion
       || Nkind (gnat_node) == N_Unchecked_Type_Conversion)