FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tree-inline.c (expand_call_inline): Use the location of the callee declaration for the inline-entry marker.

Browse source 
2018-10-02  Richard Biener  <rguenther@suse.de>

	* tree-inline.c (expand_call_inline): Use the location of
	the callee declaration for the inline-entry marker.
	* final.c (notice_source_line): Remove special-casing of
	NOTE_INSN_INLINE_ENTRY.

From-SVN: r264778
This commit is contained in:
Richard Biener 2018-10-02 10:07:29 +00:00 • committed by Richard Biener
parent 491ec3dfa9
commit cd6ae11750
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gcc/ChangeLog
View file

@ -1,3 +1,10 @@
2018-10-02 Richard Biener <rguenther@suse.de>
* tree-inline.c (expand_call_inline): Use the location of
the callee declaration for the inline-entry marker.
* final.c (notice_source_line): Remove special-casing of
NOTE_INSN_INLINE_ENTRY.
2018-10-01 Carl Love <cel@us.ibm.com>
PR 69431

11
gcc/final.c
View file

@ -3224,17 +3224,6 @@ notice_source_line (rtx_insn *insn, bool *is_stmt)
if (NOTE_MARKER_P (insn))
{
location_t loc = NOTE_MARKER_LOCATION (insn);
/* The inline entry markers (gimple, insn, note) carry the
location of the call, because that's what we want to carry
during compilation, but the location we want to output in
debug information for the inline entry point is the location
of the function itself. */
if (NOTE_KIND (insn) == NOTE_INSN_INLINE_ENTRY)
{
tree block = LOCATION_BLOCK (loc);
tree fn = block_ultimate_origin (block);
loc = DECL_SOURCE_LOCATION (fn);
}
expanded_location xloc = expand_location (loc);
if (xloc.line == 0)
{

3
gcc/tree-inline.c
View file

@ -4592,7 +4592,8 @@ expand_call_inline (basic_block bb, gimple *stmt, copy_body_data *id)
{
gimple_stmt_iterator si = gsi_last_bb (bb);
gsi_insert_after (&si, gimple_build_debug_inline_entry
(id->block, input_location), GSI_NEW_STMT);
(id->block, DECL_SOURCE_LOCATION (id->src_fn)),
GSI_NEW_STMT);
}
if (DECL_INITIAL (fn))