diff options
| author | Richard Biener <rguenther@suse.de> | 2018-09-26 07:05:01 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2018-09-26 07:05:01 +0000 |
| commit | 392047f92ad5d7c388fe42dfaa1c72c8cc1996ec (patch) | |
| tree | be2c8d41c2eb5a7a515dbb0ce88e4ddfed55a65c /gcc/tree-inline.c | |
| parent | 201054a7f042f5f175605ca64accb2a812b27bfe (diff) | |
| download | gcc-392047f92ad5d7c388fe42dfaa1c72c8cc1996ec.zip gcc-392047f92ad5d7c388fe42dfaa1c72c8cc1996ec.tar.gz gcc-392047f92ad5d7c388fe42dfaa1c72c8cc1996ec.tar.bz2 | |
re PR debug/87428 ("Missed" inline instances cause bogus DWARF to be emitted)
2018-09-26 Richard Biener <rguenther@suse.de>
PR debug/87428
PR debug/87362
* tree-inline.c (expand_call_inline): When the location
of the call is UNKNOWN_LOCATION use DECL_SOURCE_LOCATION
or BUILTINS_LOCATION for the BLOCK_SOURCE_LOCATION of
the inserted BLOCK to make inlined_function_outer_scope_p
recognize it.
* dwarf2out.c (add_call_src_coords_attributes): Do not add
coords for reserved locations.
From-SVN: r264594
Diffstat (limited to 'gcc/tree-inline.c')
| -rw-r--r-- | gcc/tree-inline.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 9352acc..b2cddc2 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -4527,10 +4527,16 @@ expand_call_inline (basic_block bb, gimple *stmt, copy_body_data *id) not refer to them in any way to not break GC for locations. */ if (gimple_block (stmt)) { + /* We do want to assign a not UNKNOWN_LOCATION BLOCK_SOURCE_LOCATION + to make inlined_function_outer_scope_p return true on this BLOCK. */ + location_t loc = LOCATION_LOCUS (gimple_location (stmt)); + if (loc == UNKNOWN_LOCATION) + loc = LOCATION_LOCUS (DECL_SOURCE_LOCATION (fn)); + if (loc == UNKNOWN_LOCATION) + loc = BUILTINS_LOCATION; id->block = make_node (BLOCK); BLOCK_ABSTRACT_ORIGIN (id->block) = fn; - BLOCK_SOURCE_LOCATION (id->block) - = LOCATION_LOCUS (gimple_location (stmt)); + BLOCK_SOURCE_LOCATION (id->block) = loc; prepend_lexical_block (gimple_block (stmt), id->block); } |