2011-12-13 Richard Guenther <rguenther@suse.de>

	PR middle-end/51481
	* tree-cfg.c (replace_uses_by): Pass proper arguments to
	maybe_clean_or_replace_eh_stmt.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@182280 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df45f44..a0e3707 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2011-12-13  Richard Guenther  <rguenther@suse.de>
 
 2011-12-13  Richard Guenther  <rguenther@suse.de>
 

+       PR middle-end/51481
+       * tree-cfg.c (replace_uses_by): Pass proper arguments to
+       maybe_clean_or_replace_eh_stmt.
+
+2011-12-13  Richard Guenther  <rguenther@suse.de>
+

        PR tree-optimization/51519
        * ipa-inline.c (edge_badness): Use edge growth in non-guessed
        branch probability case as well.
        PR tree-optimization/51519
        * ipa-inline.c (edge_badness): Use edge growth in non-guessed
        branch probability case as well.

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index d81cc67..db10daf 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1601,6 +1601,7 @@ replace_uses_by (tree name, tree val)
       if (gimple_code (stmt) != GIMPLE_PHI)
        {
          gimple_stmt_iterator gsi = gsi_for_stmt (stmt);
       if (gimple_code (stmt) != GIMPLE_PHI)
        {
          gimple_stmt_iterator gsi = gsi_for_stmt (stmt);

+         gimple orig_stmt = stmt;

          size_t i;
 
          fold_stmt (&gsi);
          size_t i;
 
          fold_stmt (&gsi);


@@ -1619,7 +1620,7 @@ replace_uses_by (tree name, tree val)
                recompute_tree_invariant_for_addr_expr (op);
            }
 
                recompute_tree_invariant_for_addr_expr (op);
            }
 

-         maybe_clean_or_replace_eh_stmt (stmt, stmt);
+         maybe_clean_or_replace_eh_stmt (orig_stmt, stmt);

          update_stmt (stmt);
        }
     }
          update_stmt (stmt);
        }
     }