From 88654ce63de73fc51a47e7d54070c2c0b6b2f34b Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 4 Jan 2018 18:04:54 +0000 Subject: [PATCH] Allow VEC_PERM_EXPR folding to fail tree-ssa-forwprop.c was asserting that a VEC_PERM_EXPR fold on three VECTOR_CSTs would always succeed, but it's possible for it to fail with variable-length vectors. 2017-12-22 Richard Sandiford gcc/ * tree-ssa-forwprop.c (is_combined_permutation_identity): Allow the VEC_PERM_EXPR fold to fail. From-SVN: r256257 --- gcc/ChangeLog | 5 +++++ gcc/tree-ssa-forwprop.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 622d648a809..64326df830a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2018-01-04 Richard Sandiford + + * tree-ssa-forwprop.c (is_combined_permutation_identity): Allow + the VEC_PERM_EXPR fold to fail. + 2018-01-04 Jakub Jelinek PR debug/83585 diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index 1aad176ccbd..58ec6b47a5b 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -1865,7 +1865,8 @@ is_combined_permutation_identity (tree mask1, tree mask2) gcc_checking_assert (TREE_CODE (mask1) == VECTOR_CST && TREE_CODE (mask2) == VECTOR_CST); mask = fold_ternary (VEC_PERM_EXPR, TREE_TYPE (mask1), mask1, mask1, mask2); - gcc_assert (TREE_CODE (mask) == VECTOR_CST); + if (mask == NULL_TREE || TREE_CODE (mask) != VECTOR_CST) + return 0; if (!VECTOR_CST_NELTS (mask).is_constant (&nelts)) return 0; -- 2.30.2