aboutsummaryrefslogtreecommitdiff
path: root/gcc/dwarf2out.c
diff options
context:
space:
mode:
authorPierre-Marie de Rodat <derodat@adacore.com>2016-10-05 07:53:37 +0000
committerPierre-Marie de Rodat <pmderodat@gcc.gnu.org>2016-10-05 07:53:37 +0000
commit7e8000b39638b4a68d16770b46b5f73d36539edc (patch)
tree21ba90c8d091f54e8e10863ba50b71f8e6617f6f /gcc/dwarf2out.c
parenta786cec431a1afac63e1ce8de53b979121dda5c7 (diff)
downloadgcc-7e8000b39638b4a68d16770b46b5f73d36539edc.zip
gcc-7e8000b39638b4a68d16770b46b5f73d36539edc.tar.gz
gcc-7e8000b39638b4a68d16770b46b5f73d36539edc.tar.bz2
DWARF: move pessimistic DWARF version checks for imported entities
A check in dwarf2out_imported_module_or_decl prevents DW_TAG_imported_module from being emitted as it was introduced in the DWARFv3 standard. However, this also prevents valid strict DWARFv2 constructs such as DW_TAG_imported_declaration from being emitted in dwarf2out_imported_module_or_decl_1. The latter already protects the emission of newer DWARF tags with appropriate checks, so the one in the former is redundant and pessimistic. This function is already called from places like process_scope_var, which are not protected anyway. This patch moves the check in dwarf2out_imported_module_or_decl so that in strict DWARFv2 mode, tags like DW_TAG_imported_declaration are emitted while DW_TAG_imported_module are not. gcc/ * dwarf2out.c (dwarf2out_imported_module_or_decl): Move DWARF version check to protect only DW_TAG_imported_module generation. gcc/testsuite/ * gnat.dg/debug7.adb, gnat.dg/debug7.ads: New testcase. From-SVN: r240772
Diffstat (limited to 'gcc/dwarf2out.c')
-rw-r--r--gcc/dwarf2out.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 7b5acda..23eaebc 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -24045,13 +24045,15 @@ dwarf2out_imported_module_or_decl (tree decl, tree name, tree context,
&& !should_emit_struct_debug (context, DINFO_USAGE_DIR_USE))
return;
- if (!(dwarf_version >= 3 || !dwarf_strict))
- return;
-
scope_die = get_context_die (context);
if (child)
{
+ /* DW_TAG_imported_module was introduced in the DWARFv3 specification, so
+ there is nothing we can do, here. */
+ if (dwarf_version < 3 && dwarf_strict)
+ return;
+
gcc_assert (scope_die->die_child);
gcc_assert (scope_die->die_child->die_tag == DW_TAG_imported_module);
gcc_assert (TREE_CODE (decl) != NAMESPACE_DECL);