From 5597a350f4143b458bbc4c9a558d5bac43c141c5 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Thu, 6 Oct 2005 12:33:02 -0700 Subject: [PATCH] re PR debug/24070 (Dwarf macro info has bad file numbers) PR debug/24070 * dwarf2out.c (lookup_filename): Return the result of maybe_emit_file. (dwarf2out_start_source_file): Print it. From-SVN: r105051 --- gcc/ChangeLog | 6 ++++++ gcc/dwarf2out.c | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 940d70a..7f7da32 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-10-06 Richard Henderson + + PR debug/24070 + * dwarf2out.c (lookup_filename): Return the result of maybe_emit_file. + (dwarf2out_start_source_file): Print it. + 2005-10-06 Geoffrey Keating * config/t-slibgcc-darwin (SHLIB_MAPFILES): Use '+='. diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 63f2f98..7ee5edb 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -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 int lineno, const char *filename) 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"); } } -- 2.7.4