This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
fix 24070
- From: Richard Henderson <rth at redhat dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 6 Oct 2005 12:42:05 -0700
- Subject: fix 24070
maybe_emit_file doesn't just emit a ".file" directive, it also
remaps file numbers. So you can't ignore the result.
r~
* dwarf2out.c (lookup_filename): Return the result of maybe_emit_file.
(dwarf2out_start_source_file): Print it.
Index: dwarf2out.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/dwarf2out.c,v
retrieving revision 1.614
diff -u -p -d -r1.614 dwarf2out.c
--- dwarf2out.c 7 Sep 2005 07:47:08 -0000 1.614
+++ dwarf2out.c 6 Oct 2005 19:30:23 -0000
@@ -13373,7 +13373,7 @@ lookup_filename (const char *file_name)
prune_unused_types_walk_attribs. */
if (DWARF2_ASM_LINE_DEBUG_INFO && ! flag_eliminate_unused_debug_types)
- maybe_emit_file (i);
+ return maybe_emit_file (i);
return i;
}
@@ -13591,13 +13591,15 @@ dwarf2out_start_source_file (unsigned in
if (debug_info_level >= DINFO_LEVEL_VERBOSE)
{
+ int fileno;
+
named_section_flags (DEBUG_MACINFO_SECTION, SECTION_DEBUG);
dw2_asm_output_data (1, DW_MACINFO_start_file, "Start new file");
dw2_asm_output_data_uleb128 (lineno, "Included from line number %d",
lineno);
- maybe_emit_file (lookup_filename (filename));
- dw2_asm_output_data_uleb128 (lookup_filename (filename),
- "Filename we just started");
+
+ fileno = maybe_emit_file (lookup_filename (filename));
+ dw2_asm_output_data_uleb128 (fileno, "Filename we just started");
}
}