re PR lto/87187 (FAIL: gfortran.dg/short_circuiting_3.f90 -g -flto (internal compi...

2019-01-24  Richard Biener  <rguenther@suse.de>

	PR lto/87187
	* tree-streamer-out.c (write_ts_decl_common_tree_pointers):
	When in "legacy" debug mode make sure to reset self-origins.

From-SVN: r268236

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f7013b71eadaf1173ee16ea4c44afc5a1043d619..960e8dacef9318b6ff16e0958fdae48d526b3993 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-01-24  Richard Biener  <rguenther@suse.de>
+
+       PR lto/87187
+       * tree-streamer-out.c (write_ts_decl_common_tree_pointers):
+       When in "legacy" debug mode make sure to reset self-origins.
+
 2019-01-24  Martin Liska  <mliska@suse.cz>
 
        PR gcov-profile/88994

diff --git a/gcc/tree-streamer-out.c b/gcc/tree-streamer-out.c
index ce7e8086b398b2c94f7afeae203a1f9b968b3ad1..b66426387d68af5b88b8fe349aff7470f457181d 100644 (file)
--- a/gcc/tree-streamer-out.c
+++ b/gcc/tree-streamer-out.c
@@ -603,7 +603,16 @@ write_ts_decl_common_tree_pointers (struct output_block *ob, tree expr,
      special handling in LTO, it must be handled by streamer hooks.  */
 
   stream_write_tree (ob, DECL_ATTRIBUTES (expr), ref_p);
-  stream_write_tree (ob, DECL_ABSTRACT_ORIGIN (expr), ref_p);
+
+  /* On non-early-LTO enabled targets we claim we compiled with -g0
+     but dwarf2out still did its set_decl_origin_self game fooling
+     itself late.  Und that here since we won't have access to the
+     early generated abstract DIEs.  */
+  tree ao = DECL_ABSTRACT_ORIGIN (expr);
+  if (debug_info_level == DINFO_LEVEL_NONE
+      && ao == expr)
+    ao = NULL_TREE;
+  stream_write_tree (ob, ao, ref_p);
 
   if ((VAR_P (expr) || TREE_CODE (expr) == PARM_DECL)
       && DECL_HAS_VALUE_EXPR_P (expr))