From c7f902196193ba3fe4540b580cbc613d53c05a13 Mon Sep 17 00:00:00 2001
From: Steven Bosscher <stevenb@suse.de>
Date: Wed, 15 Sep 2004 21:47:45 +0000
Subject: [PATCH] Makefile.in (tree-ssa-dom.o): Depend on tree-ssa-propagate.h.

	* Makefile.in (tree-ssa-dom.o): Depend on tree-ssa-propagate.h.
	* tree-ssa-dom.c (cprop_into_stmt): Recompute TREE_INVARIANT
	after propagating into an ADDR_EXPR.

From-SVN: r87566
---
 gcc/ChangeLog      | 6 ++++++
 gcc/Makefile.in    | 3 ++-
 gcc/tree-ssa-dom.c | 9 +++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b87ba75660c..f8a0d0461c4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-15  Steven Bosscher  <stevenb@suse.de>
+
+	* Makefile.in (tree-ssa-dom.o): Depend on tree-ssa-propagate.h.
+	* tree-ssa-dom.c (cprop_into_stmt): Recompute TREE_INVARIANT
+        after propagating into an ADDR_EXPR.
+
 2004-09-15  Andrew Pinski  <apinski@apple.com>
 
 	PR rtl-opt/17427
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index b3c83c8b5a2..4c60618be0c 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1636,7 +1636,8 @@ tree-ssa-propagate.o : tree-ssa-propagate.c $(TREE_FLOW_H) $(CONFIG_H) \
 tree-ssa-dom.o : tree-ssa-dom.c $(TREE_FLOW_H) $(CONFIG_H) $(SYSTEM_H) \
    $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) output.h diagnostic.h \
    errors.h function.h $(TIMEVAR_H) $(TM_H) coretypes.h $(TREE_DUMP_H) \
-   $(BASIC_BLOCK_H) domwalk.h real.h tree-pass.h $(FLAGS_H) langhooks.h
+   $(BASIC_BLOCK_H) domwalk.h real.h tree-pass.h $(FLAGS_H) langhooks.h \
+   tree-ssa-propagate.h
 tree-ssa-threadupdate.o : tree-ssa-threadupdate.c $(TREE_FLOW_H) $(CONFIG_H) \
    $(SYSTEM_H) $(RTL_H) $(TREE_H) $(TM_P_H) $(EXPR_H) $(GGC_H) output.h \
    diagnostic.h errors.h function.h $(TM_H) coretypes.h $(TREE_DUMP_H) \
diff --git a/gcc/tree-ssa-dom.c b/gcc/tree-ssa-dom.c
index 50b5cc07708..43809e1643a 100644
--- a/gcc/tree-ssa-dom.c
+++ b/gcc/tree-ssa-dom.c
@@ -40,6 +40,7 @@ Boston, MA 02111-1307, USA.  */
 #include "domwalk.h"
 #include "real.h"
 #include "tree-pass.h"
+#include "tree-ssa-propagate.h"
 #include "langhooks.h"
 
 /* This file implements optimizations on the dominator tree.  */
@@ -2646,6 +2647,7 @@ cprop_into_stmt (tree stmt, varray_type const_and_copies)
   bool may_have_exposed_new_symbols = false;
   use_operand_p op_p;
   ssa_op_iter iter;
+  tree rhs;
 
   FOR_EACH_SSA_USE_OPERAND (op_p, stmt, iter, SSA_OP_ALL_USES)
     {
@@ -2654,6 +2656,13 @@ cprop_into_stmt (tree stmt, varray_type const_and_copies)
 	  |= cprop_operand (stmt, op_p, const_and_copies);
     }
 
+  if (may_have_exposed_new_symbols)
+    {
+      rhs = get_rhs (stmt);
+      if (rhs && TREE_CODE (rhs) == ADDR_EXPR)
+	recompute_tree_invarant_for_addr_expr (rhs);
+    }
+
   return may_have_exposed_new_symbols;
 }
 
-- 
2.30.2