From 4f9dbaaae8b46290b40ec43e56fdfc10dfd477b0 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Mon, 15 Aug 2011 12:17:33 +0000 Subject: [PATCH] re PR tree-optimization/50058 (FAIL: g++.dg/tree-ssa/pr41186.C) 2011-08-15 Richard Guenther PR tree-optimization/50058 * tree-ssa-sccvn.c (vn_reference_lookup_3): Relax aggregate copy matching. From-SVN: r177760 --- gcc/ChangeLog | 6 ++++++ gcc/tree-ssa-sccvn.c | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 32162ecd41f..58e2216f163 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-08-15 Richard Guenther + + PR tree-optimization/50058 + * tree-ssa-sccvn.c (vn_reference_lookup_3): Relax aggregate + copy matching. + 2011-08-15 Ramana Radhakrishnan PR target/50022 diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index d65b9ebe9c2..4ccc0a29fd5 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.