[COMMITTED] ada: Fix wrong access for qualified aggregate with storage model

[Marc Poulhiès via Gcc-patches]

From: Eric Botcazou <ebotca...@adacore.com>

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.

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

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

diff --git a/gcc/ada/gcc-interface/trans.cc b/gcc/ada/gcc-interface/trans.cc
index 2e8d979831f..ddc7b6dde1e 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);
 }
-- 
2.40.0