From: Tom Tromey <tro...@adacore.com>
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.
Tested on x86_64-pc-linux-gnu, committed on master.
---
gcc/ada/gcc-interface/decl.cc | 8 +++++++-
gcc/ada/gcc-interface/misc.cc | 14 +++++++-------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/gcc/ada/gcc-interface/decl.cc b/gcc/ada/gcc-interface/decl.cc
index ae756b35fdb..0cf7d3cee60 100644
--- a/gcc/ada/gcc-interface/decl.cc
+++ b/gcc/ada/gcc-interface/decl.cc
@@ -2388,6 +2388,11 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree
gnu_expr, bool definition)
= (Is_Packed (gnat_entity)
|| Is_Packed_Array_Impl_Type (gnat_entity));
+ TYPE_BIT_PACKED_ARRAY_TYPE_P (tem)
+ = (Is_Packed_Array_Impl_Type (gnat_entity)
+ ? Is_Bit_Packed_Array (Original_Array_Type (gnat_entity))
+ : Is_Bit_Packed_Array (gnat_entity));
+
if (Treat_As_Volatile (gnat_entity))
tem = change_qualified_type (tem, TYPE_QUAL_VOLATILE);
@@ -2815,7 +2820,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr,
bool definition)
TYPE_BIT_PACKED_ARRAY_TYPE_P (gnu_type)
= (Is_Packed_Array_Impl_Type (gnat_entity)
- && Is_Bit_Packed_Array (Original_Array_Type (gnat_entity)));
+ ? Is_Bit_Packed_Array (Original_Array_Type (gnat_entity))
+ : Is_Bit_Packed_Array (gnat_entity));
/* If the maximum size doesn't overflow, use it. */
if (gnu_max_size
diff --git a/gcc/ada/gcc-interface/misc.cc b/gcc/ada/gcc-interface/misc.cc
index 30319ae58b1..3b21bf5b43a 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;
--
2.40.0
