* tree-ssa-propagate.c (set_rhs): Copy EXPR_LOCATION if

	needed.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f81896b..11c8865 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-22  Jakub Jelinek  <jakub@redhat.com>
+
+       * tree-ssa-propagate.c (set_rhs): Copy EXPR_LOCATION if
+       needed.
+
 2006-09-21  Richard Sandiford  <richard@codesourcery.com>
 
        * varasm.c (copy_constant): Fix reversed gcc_assert check.

diff --git a/gcc/tree-ssa-propagate.c b/gcc/tree-ssa-propagate.c
index 111b39d..f9ece62 100644 (file)
--- a/gcc/tree-ssa-propagate.c
+++ b/gcc/tree-ssa-propagate.c
@@ -592,6 +592,13 @@ set_rhs (tree *stmt_p, tree expr)
           || code == MODIFY_EXPR)
     return false;
 
+  if (EXPR_HAS_LOCATION (stmt)
+      && EXPR_P (expr)
+      && ! EXPR_HAS_LOCATION (expr)
+      && TREE_SIDE_EFFECTS (expr)
+      && TREE_CODE (expr) != LABEL_EXPR)
+    SET_EXPR_LOCATION (expr, EXPR_LOCATION (stmt));
+
   switch (TREE_CODE (stmt))
     {
     case RETURN_EXPR: