aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2022-06-22 20:38:15 +0200
committerPierre-Marie de Rodat <derodat@adacore.com>2022-07-13 10:01:20 +0000
commit589163e18a291ce6f0befc67be4ca9ad6924d959 (patch)
treefee1e93d72a17a34605ce5a2cf29e5d85d881b16
parentd927cb527cb17547b24d2b52ddd29e8fad621a66 (diff)
downloadgcc-589163e18a291ce6f0befc67be4ca9ad6924d959.zip
gcc-589163e18a291ce6f0befc67be4ca9ad6924d959.tar.gz
gcc-589163e18a291ce6f0befc67be4ca9ad6924d959.tar.bz2
[Ada] Do not generate DW_TAG_typedef for constrained array types
It no longer serves any useful purpose at this point. gcc/ada/ * gcc-interface/utils.cc (gnat_pushdecl): Build DECL_ORIGINAL_TYPE only for pointer types.
-rw-r--r--gcc/ada/gcc-interface/utils.cc25
1 files changed, 9 insertions, 16 deletions
diff --git a/gcc/ada/gcc-interface/utils.cc b/gcc/ada/gcc-interface/utils.cc
index 05adacd..a571430 100644
--- a/gcc/ada/gcc-interface/utils.cc
+++ b/gcc/ada/gcc-interface/utils.cc
@@ -877,21 +877,18 @@ gnat_pushdecl (tree decl, Node_Id gnat_node)
{
tree t = TREE_TYPE (decl);
- /* Array and pointer types aren't tagged types in the C sense so we need
- to generate a typedef in DWARF for them and make sure it is preserved,
- unless the type is artificial. */
+ /* Pointer types aren't named types in the C sense so we need to generate
+ a typedef in DWARF for them and make sure it is preserved, unless the
+ type is artificial. */
if (!(TYPE_NAME (t) && TREE_CODE (TYPE_NAME (t)) == TYPE_DECL)
- && ((TREE_CODE (t) != ARRAY_TYPE && TREE_CODE (t) != POINTER_TYPE)
- || DECL_ARTIFICIAL (decl)))
+ && (TREE_CODE (t) != POINTER_TYPE || DECL_ARTIFICIAL (decl)))
;
- /* For array and pointer types, create the DECL_ORIGINAL_TYPE that will
- generate the typedef in DWARF. Also do that for fat pointer types
- because, even though they are tagged types in the C sense, they are
- still XUP types attached to the base array type at this point. */
+ /* For pointer types, create the DECL_ORIGINAL_TYPE that will generate
+ the typedef in DWARF. Also do that for fat pointer types because,
+ even though they are named types in the C sense, they are still the
+ XUP types created for the base array type at this point. */
else if (!DECL_ARTIFICIAL (decl)
- && (TREE_CODE (t) == ARRAY_TYPE
- || TREE_CODE (t) == POINTER_TYPE
- || TYPE_IS_FAT_POINTER_P (t)))
+ && (TREE_CODE (t) == POINTER_TYPE || TYPE_IS_FAT_POINTER_P (t)))
{
tree tt = build_variant_type_copy (t);
TYPE_NAME (tt) = decl;
@@ -905,10 +902,6 @@ gnat_pushdecl (tree decl, Node_Id gnat_node)
DECL_ORIGINAL_TYPE (decl) = DECL_ORIGINAL_TYPE (TYPE_NAME (t));
else
DECL_ORIGINAL_TYPE (decl) = t;
- /* Array types need to have a name so that they can be related to
- their GNAT encodings. */
- if (TREE_CODE (t) == ARRAY_TYPE && !TYPE_NAME (t))
- TYPE_NAME (t) = DECL_NAME (decl);
/* Remark the canonical fat pointer type as artificial. */
if (TYPE_IS_FAT_POINTER_P (t))
TYPE_ARTIFICIAL (t) = 1;