From: Eric Botcazou Date: Mon, 25 May 2020 08:32:21 +0000 (+0200) Subject: Fix small fallout of earlier change X-Git-Tag: upstream/12.2.0~16351 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0949185aed5830fe40bd4fa4a80b21bc90410406;p=platform%2Fupstream%2Fgcc.git Fix small fallout of earlier change gcc/ada/ChangeLog * gcc-interface/misc.c (get_array_bit_stride): Get to the debug type, if any, before calling gnat_get_array_descr_info. --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 769728a..d2020b8 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,5 +1,10 @@ 2020-05-25 Eric Botcazou + * gcc-interface/misc.c (get_array_bit_stride): Get to the debug type, + if any, before calling gnat_get_array_descr_info. + +2020-05-25 Eric Botcazou + * gcc-interface/decl.c (gnat_to_gnu_entity) : Tidy up. (build_variant_list): Add GNAT_VARIANT_PART parameter and annotate its variants if it is present. Adjust the recursive call by passing the diff --git a/gcc/ada/gcc-interface/misc.c b/gcc/ada/gcc-interface/misc.c index 5a5850a..f8fa856 100644 --- a/gcc/ada/gcc-interface/misc.c +++ b/gcc/ada/gcc-interface/misc.c @@ -1003,6 +1003,9 @@ get_array_bit_stride (tree comp_type) if (INTEGRAL_TYPE_P (comp_type)) return TYPE_RM_SIZE (comp_type); + /* The gnat_get_array_descr_info debug hook expects a debug tyoe. */ + comp_type = maybe_debug_type (comp_type); + /* Otherwise, see if this is an array we can analyze; if it's not, punt. */ memset (&info, 0, sizeof (info)); if (!gnat_get_array_descr_info (comp_type, &info) || !info.stride)