diff options
| author | Tom Tromey <tromey@adacore.com> | 2023-08-21 17:11:13 +0000 |
|---|---|---|
| committer | Marc Poulhiès <poulhies@adacore.com> | 2023-09-05 13:05:17 +0200 |
| commit | 7f77d69bc86d25262b88503d0f5e3fff11c7898e (patch) | |
| tree | 2f8af58ca90663c61148c31024bd2dbcc8c1cfc2 /gcc/ada/gcc-interface/misc.cc | |
| parent | 10b4a454b2f5c2c3c6c98b4f7bf6bcf537c072cc (diff) | |
| download | gcc-7f77d69bc86d25262b88503d0f5e3fff11c7898e.zip gcc-7f77d69bc86d25262b88503d0f5e3fff11c7898e.tar.gz gcc-7f77d69bc86d25262b88503d0f5e3fff11c7898e.tar.bz2 | |
ada: Fix DWARF for certain arrays
An array whose index type is a nonstandard enum will be marked as
"packed", but should not emit DW_AT_bit_stride unless it is also
bit-packed.
gcc/ada/
* gcc-interface/decl.cc (gnat_to_gnu_entity): Set bit-packed for
constrained and unconstrained array types.
* gcc-interface/misc.cc (gnat_get_array_descr_info): Examine
BIT_PACKED_ARRAY_TYPE_P.
Diffstat (limited to 'gcc/ada/gcc-interface/misc.cc')
| -rw-r--r-- | gcc/ada/gcc-interface/misc.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gcc/ada/gcc-interface/misc.cc b/gcc/ada/gcc-interface/misc.cc index 30319ae..3b21bf5 100644 --- a/gcc/ada/gcc-interface/misc.cc +++ b/gcc/ada/gcc-interface/misc.cc @@ -774,7 +774,7 @@ gnat_get_array_descr_info (const_tree const_type, { tree type = const_cast<tree> (const_type); tree first_dimen, dimen; - bool is_packed_array, is_array; + bool is_bit_packed_array, is_array; int i; /* Temporaries created in the first pass and used in the second one for thin @@ -784,15 +784,15 @@ gnat_get_array_descr_info (const_tree const_type, tree thinptr_template_expr = NULL_TREE; tree thinptr_bound_field = NULL_TREE; - /* If we have an implementation type for a packed array, get the orignial + /* If we have an implementation type for a packed array, get the original array type. */ if (TYPE_IMPL_PACKED_ARRAY_P (type) && TYPE_ORIGINAL_PACKED_ARRAY (type)) { + is_bit_packed_array = BIT_PACKED_ARRAY_TYPE_P (type); type = TYPE_ORIGINAL_PACKED_ARRAY (type); - is_packed_array = true; } else - is_packed_array = false; + is_bit_packed_array = false; /* First pass: gather all information about this array except everything related to dimensions. */ @@ -850,8 +850,8 @@ gnat_get_array_descr_info (const_tree const_type, order, so our view here has reversed dimensions. */ const bool convention_fortran_p = TYPE_CONVENTION_FORTRAN_P (first_dimen); - if (TYPE_PACKED (first_dimen)) - is_packed_array = true; + if (BIT_PACKED_ARRAY_TYPE_P (first_dimen)) + is_bit_packed_array = true; /* ??? For row major ordering, we probably want to emit nothing and instead specify it as the default in Dw_TAG_compile_unit. */ @@ -975,7 +975,7 @@ gnat_get_array_descr_info (const_tree const_type, /* We need to specify a bit stride when it does not correspond to the natural size of the contained elements. ??? Note that we do not support packed records and nested packed arrays. */ - else if (is_packed_array) + else if (is_bit_packed_array) { info->stride = get_array_bit_stride (info->element_type); info->stride_in_bits = true; |