From: Richard Guenther <rguenther@suse.de>
Date: Mon, 15 Aug 2011 12:17:33 +0000 (+0000)
Subject: re PR tree-optimization/50058 (FAIL: g++.dg/tree-ssa/pr41186.C)
X-Git-Tag: releases/gcc-4.7.0~4449
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f9dbaaae8b46290b40ec43e56fdfc10dfd477b0;p=thirdparty%2Fgcc.git

re PR tree-optimization/50058 (FAIL: g++.dg/tree-ssa/pr41186.C)

2011-08-15  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/50058
	* tree-ssa-sccvn.c (vn_reference_lookup_3): Relax aggregate
	copy matching.

From-SVN: r177760
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 32162ecd41fb..58e2216f163d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-15  Richard Guenther  <rguenther@suse.de>
+
+	PR tree-optimization/50058
+	* tree-ssa-sccvn.c (vn_reference_lookup_3): Relax aggregate
+	copy matching.
+
 2011-08-15  Ramana Radhakrishnan  <ramana.radhakrishnan@linaro.org>
 
 	PR target/50022
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index d65b9ebe9c26..4ccc0a29fd51 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -1485,12 +1485,11 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *vr_)
 	 may fail when comparing types for compatibility.  But we really
 	 don't care here - further lookups with the rewritten operands
 	 will simply fail if we messed up types too badly.  */
-      if (j == 0 && i == 0
+      if (j == 0 && i >= 0
 	  && VEC_index (vn_reference_op_s, lhs_ops, 0)->opcode == MEM_REF
-	  && VEC_index (vn_reference_op_s, vr->operands, i)->opcode == MEM_REF
-	  && tree_int_cst_equal
-	       (VEC_index (vn_reference_op_s, lhs_ops, 0)->op0,
-		VEC_index (vn_reference_op_s, vr->operands, i)->op0))
+	  && VEC_index (vn_reference_op_s, lhs_ops, 0)->off != -1
+	  && (VEC_index (vn_reference_op_s, lhs_ops, 0)->off
+	      == VEC_index (vn_reference_op_s, vr->operands, i)->off))
 	i--, j--;
 
       /* i now points to the first additional op.