This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Minor dwarf2out PATCH to add is_unit_die
- From: Jason Merrill <jason at redhat dot com>
- To: gcc-patches List <gcc-patches at gcc dot gnu dot org>
- Date: Mon, 04 Jun 2012 17:36:15 -0400
- Subject: Minor dwarf2out PATCH to add is_unit_die
Now that there are three different varieties of unit, it seems useful to
have a single predicate for them.
Tested x86_64-pc-linux-gnu, applying to trunk.
commit c879217dbfeaddebdde9121eb6750b75f650fe9f
Author: Jason Merrill <jason@redhat.com>
Date: Sun May 6 12:24:05 2012 -0400
* dwarf2out.c (is_unit_die): New.
(copy_declaration_context, copy_ancestor_tree): Use it.
(copy_decls_walk): Likewise.
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index babc5ba..3e92a14 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -5972,6 +5972,16 @@ is_cu_die (dw_die_ref c)
return c && c->die_tag == DW_TAG_compile_unit;
}
+/* Returns true iff C is a unit DIE of some sort. */
+
+static inline bool
+is_unit_die (dw_die_ref c)
+{
+ return c && (c->die_tag == DW_TAG_compile_unit
+ || c->die_tag == DW_TAG_partial_unit
+ || c->die_tag == DW_TAG_type_unit);
+}
+
static char *
gen_internal_sym (const char *prefix)
{
@@ -6379,8 +6389,7 @@ copy_declaration_context (dw_die_ref unit, dw_die_ref die)
}
if (decl->die_parent != NULL
- && decl->die_parent->die_tag != DW_TAG_compile_unit
- && decl->die_parent->die_tag != DW_TAG_type_unit)
+ && !is_unit_die (decl->die_parent))
{
new_decl = copy_ancestor_tree (unit, decl, NULL);
if (new_decl != NULL)
@@ -6654,8 +6663,7 @@ copy_ancestor_tree (dw_die_ref unit, dw_die_ref die, htab_t decl_table)
dw_die_ref spec = get_AT_ref (parent, DW_AT_specification);
if (spec != NULL)
parent = spec;
- if (parent->die_tag != DW_TAG_compile_unit
- && parent->die_tag != DW_TAG_type_unit)
+ if (!is_unit_die (parent))
new_parent = copy_ancestor_tree (unit, parent, decl_table);
}
@@ -6754,8 +6762,7 @@ copy_decls_walk (dw_die_ref unit, dw_die_ref die, htab_t decl_table)
/* If TARG has surrounding context, copy its ancestor tree
into the new type unit. */
if (targ->die_parent != NULL
- && targ->die_parent->die_tag != DW_TAG_compile_unit
- && targ->die_parent->die_tag != DW_TAG_type_unit)
+ && !is_unit_die (targ->die_parent))
parent = copy_ancestor_tree (unit, targ->die_parent,
decl_table);