diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2012-10-02 15:43:09 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2012-10-02 15:43:09 +0200 |
| commit | 13396b6e4da82e926e666e07fae9186825de65e8 (patch) | |
| tree | 3adb3336c25f30bb07febeff1971bf93fbfcc921 /gcc/tree-ssa-sccvn.c | |
| parent | faf86a02f349e39c74949b49a1b95bd8a1f99ceb (diff) | |
| download | gcc-13396b6e4da82e926e666e07fae9186825de65e8.zip gcc-13396b6e4da82e926e666e07fae9186825de65e8.tar.gz gcc-13396b6e4da82e926e666e07fae9186825de65e8.tar.bz2 | |
re PR tree-optimization/54713 (error: non-trivial conversion at assignment in gcc.c-torture/compile/pr53410-2.c)
PR tree-optimization/54713
* expr.c (categorize_ctor_elements_1): Don't assume purpose is
non-NULL.
* tree-cfg.c (verify_gimple_assign_single): Add verification of
vector CONSTRUCTORs.
* tree-ssa-sccvn.c (vn_reference_lookup_3): For VECTOR_TYPE
CONSTRUCTORs, don't do anything if element type is VECTOR_TYPE,
and don't check index.
* tree-vect-slp.c (vect_get_constant_vectors): VIEW_CONVERT_EXPR
ctor elements first if their type isn't compatible with vector
element type.
From-SVN: r191983
Diffstat (limited to 'gcc/tree-ssa-sccvn.c')
| -rw-r--r-- | gcc/tree-ssa-sccvn.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index 9e62ebe..832328d 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -1,5 +1,5 @@ /* SCC value numbering for trees - Copyright (C) 2006, 2007, 2008, 2009, 2010 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Contributed by Daniel Berlin <dan@dberlin.org> @@ -1639,8 +1639,12 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *vr_) if (i < CONSTRUCTOR_NELTS (ctor)) { constructor_elt *elt = CONSTRUCTOR_ELT (ctor, i); - if (compare_tree_int (elt->index, i) == 0) - val = elt->value; + if (TREE_CODE (TREE_TYPE (rhs1)) == VECTOR_TYPE) + { + if (TREE_CODE (TREE_TYPE (elt->value)) + != VECTOR_TYPE) + val = elt->value; + } } } if (val) |