re PR bootstrap/54876 (LTO bootstrap broken, streaming garbage-collected BLOCK)

2012-10-10  Richard Biener  <rguenther@suse.de>

	PR middle-end/54876
	* ipa-prop.c (prune_expression_for_jf_1): New function.
	(prune_expression_for_jf): Clear EXPR_LOCATION for all
	sub-expressions as well.

From-SVN: r192293

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 153abd42e53f2d191b7189089337077eabc6edc7..c21398d27a0bd246466cbfdead6177546a7b7713 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-10-10  Richard Biener  <rguenther@suse.de>
+
+       PR middle-end/54876
+       * ipa-prop.c (prune_expression_for_jf_1): New function.
+       (prune_expression_for_jf): Clear EXPR_LOCATION for all
+       sub-expressions as well.
+
 2012-10-10  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
        * config.gcc: Enable zEC12 for with-arch and with-tune

diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c
index fb2346bdc45214fbcb90f9c04a40720ed9b2054f..714dd8f7bcb81dd6cbc6b9dfd65fff91fd0bbb0b 100644 (file)
--- a/gcc/ipa-prop.c
+++ b/gcc/ipa-prop.c
@@ -287,6 +287,18 @@ ipa_print_all_jump_functions (FILE *f)
     }
 }
 
+/* Worker for prune_expression_for_jf.  */
+
+static tree
+prune_expression_for_jf_1 (tree *tp, int *walk_subtrees, void *)
+{
+  if (EXPR_P (*tp))
+    SET_EXPR_LOCATION (*tp, UNKNOWN_LOCATION);
+  else
+    *walk_subtrees = 0;
+  return NULL_TREE;
+}
+
 /* Return the expression tree EXPR unshared and with location stripped off.  */
 
 static tree
@@ -295,7 +307,7 @@ prune_expression_for_jf (tree exp)
   if (EXPR_P (exp))
     {
       exp = unshare_expr (exp);
-      SET_EXPR_LOCATION (exp, UNKNOWN_LOCATION);
+      walk_tree (&exp, prune_expression_for_jf_1, NULL, NULL);
     }
   return exp;
 }