From: Eric Botcazou <ebotcazou@adacore.com>
Date: Wed, 12 Apr 2023 17:18:24 +0000 (+0200)
Subject: ada: Fix wrong access for qualified aggregate with storage model
X-Git-Tag: basepoints/gcc-15~8743
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a51ab54b7cfcb1c6bb004230e02280408f55083;p=thirdparty%2Fgcc.git

ada: Fix wrong access for qualified aggregate with storage model

The previous fix to get_storage_model_access was incomplete and needs to be
extended to the node itself.

gcc/ada/

	* gcc-interface/trans.cc (get_storage_model_access): Also strip any
	type conversion in the node when unwinding the components.
---

diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc
index 2e8d979831f3..ddc7b6dde1e9 100644
--- a/gcc/ada/gcc-interface/trans.cc
+++ b/gcc/ada/gcc-interface/trans.cc
@@ -4438,12 +4438,15 @@ get_storage_model_access (Node_Id gnat_node, Entity_Id *gnat_smo)
 	  && Prefix (Parent (gnat_parent)) == gnat_parent))
     return;
 
-  /* Now strip any type conversion from GNAT_NODE.  */
+  /* Find the innermost prefix in GNAT_NODE, stripping any type conversion.  */
   if (node_is_type_conversion (gnat_node))
     gnat_node = Expression (gnat_node);
-
   while (node_is_component (gnat_node))
-    gnat_node = Prefix (gnat_node);
+    {
+      gnat_node = Prefix (gnat_node);
+      if (node_is_type_conversion (gnat_node))
+	gnat_node = Expression (gnat_node);
+    }
 
   *gnat_smo = get_storage_model (gnat_node);
 }