From: mueller <mueller@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 21 Jan 2007 16:12:10 +0000 (+0000)
Subject: 2007-01-21  Dirk Mueller  <dmueller@suse.de>
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=533a9fbc2542e52b8366dda8158b1d7ec7ee49bd;hp=e836bf5a6e73e844eda95280f470528aee7961b0

2007-01-21  Dirk Mueller  <dmueller@suse.de>

        PR bootstrap/30511
        * tree-vrp.c (check_array_bounds): do not warn
        about ADDR_EXPR's of ARRAY_REF's which are immediately
        used in binary expressions.


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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index de0752707b2..742e60fe45a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-21  Dirk Mueller  <dmueller@suse.de>
+
+	PR bootstrap/30511
+	* tree-vrp.c (check_array_bounds): do not warn
+	about ADDR_EXPR's of ARRAY_REF's which are immediately
+	used in binary expressions.
+
 2007-01-21  Ira Rosen  <irar@il.ibm.com>
 
 	* tree-vectorizer.h (struct _stmt_vec_info): Add new field 
diff --git a/gcc/tree-vrp.c b/gcc/tree-vrp.c
index b466edf4c6f..6fb2a7271ba 100644
--- a/gcc/tree-vrp.c
+++ b/gcc/tree-vrp.c
@@ -3564,7 +3564,8 @@ static tree
 check_array_bounds (tree *tp, int *walk_subtree, void *data)
 {
   tree t = *tp;
-  location_t *location = EXPR_LOCUS ((tree) data);
+  tree stmt = (tree)data;
+  location_t *location = EXPR_LOCUS (stmt);
 
   *walk_subtree = TRUE;
 
@@ -3572,18 +3573,34 @@ check_array_bounds (tree *tp, int *walk_subtree, void *data)
     check_array_ref (t, location, false /*ignore_off_by_one*/);
   else if (TREE_CODE (t) == ADDR_EXPR)
     {
+       use_operand_p op;
+       tree use_stmt;
        t = TREE_OPERAND (t, 0);
 
        /* Don't warn on statements like
-          ssa_name = 500 + &array[-200] which are sometimes
-          produced by various optimizing passes.  */
-       if (TREE_CODE ((tree)data) == GIMPLE_MODIFY_STMT
-           && BINARY_CLASS_P (GIMPLE_STMT_OPERAND ((tree)data, 1)))
-         {
-           *walk_subtree = FALSE;
-           return NULL_TREE;
-         }
-       while (handled_component_p (t))
+
+          ssa_name = 500 + &array[-200]
+
+          or
+
+          ssa_name = &array[-200]
+          other_name = ssa_name + 300;
+
+          which are sometimes
+          produced by other optimizing passes.  */
+
+       if (TREE_CODE (stmt) == GIMPLE_MODIFY_STMT
+           && BINARY_CLASS_P (GIMPLE_STMT_OPERAND (stmt, 1)))
+         *walk_subtree = FALSE;
+
+       if (TREE_CODE (stmt) == GIMPLE_MODIFY_STMT
+           && TREE_CODE (GIMPLE_STMT_OPERAND (stmt, 0)) == SSA_NAME
+           && single_imm_use (GIMPLE_STMT_OPERAND (stmt, 0), &op, &use_stmt)
+           && TREE_CODE (use_stmt) == GIMPLE_MODIFY_STMT
+           && BINARY_CLASS_P (GIMPLE_STMT_OPERAND (use_stmt, 1)))
+         *walk_subtree = FALSE;
+
+       while (*walk_subtree && handled_component_p (t))
          {
            if (TREE_CODE (t) == ARRAY_REF)
              check_array_ref (t, location, true /*ignore_off_by_one*/);