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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1b25c3eebf283ed8102ae1afc1cc07c4ebe8afb2..d3f3de2cf84d8c7cfa255f9f4df52bd18921b4a4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
 2018-09-25  Segher Boessenkool  <segher@kernel.crashing.org>
 
        * config/rs6000/rs6000.md (*movcc_internal1): Use set_attr_alternative.

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 160726930bd873b0bb36b6c436d9cdfd2e75961d..3c10ec8bbccf87028c4fdff19f7a392daef429fd 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -23907,6 +23907,10 @@ gen_label_die (tree decl, dw_die_ref context_die)
 static inline void
 add_call_src_coords_attributes (tree stmt, dw_die_ref die)
 {
+  /* We can end up with BUILTINS_LOCATION here.  */
+  if (RESERVED_LOCATION_P (BLOCK_SOURCE_LOCATION (stmt)))
+    return;
+
   expanded_location s = expand_location (BLOCK_SOURCE_LOCATION (stmt));
 
   if (dwarf_version >= 3 || !dwarf_strict)

diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index 9352acc8af6bd938ba6b252ba3e9ab58ef7d92c0..b2cddc223120406f748e004d123837df55d674c5 100644 (file)
--- 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);
     }