From 6c3d550c4a934d9669455aa81836772b4520e39f Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 6 Mar 2009 10:48:25 +0100 Subject: [PATCH] re PR debug/39387 (Wrong DW_AT_decl_line on DW_TAG_imported* for using directives in C+ functions) PR debug/39387 * dwarf2out.c (dwarf2out_imported_module_or_decl_1): For IMPORTED_DECL take locus from its DECL_SOURCE_LOCATION instead of input_location. From-SVN: r144666 --- gcc/ChangeLog | 6 ++++++ gcc/dwarf2out.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d2bb30f..8809bb7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-03-06 Jakub Jelinek + + PR debug/39387 + * dwarf2out.c (dwarf2out_imported_module_or_decl_1): For IMPORTED_DECL + take locus from its DECL_SOURCE_LOCATION instead of input_location. + 2009-03-05 Bernd Schmidt * config/bfin/bfin.c (bfin_discover_loop): When retrying fails, mark diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 848926b..22852fa 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -15490,7 +15490,10 @@ dwarf2out_imported_module_or_decl_1 (tree decl, lexical_block_die, lexical_block); - xloc = expand_location (input_location); + if (TREE_CODE (decl) == IMPORTED_DECL) + xloc = expand_location (DECL_SOURCE_LOCATION (decl)); + else + xloc = expand_location (input_location); add_AT_file (imported_die, DW_AT_decl_file, lookup_filename (xloc.file)); add_AT_unsigned (imported_die, DW_AT_decl_line, xloc.line); if (name) -- 2.7.4