diff options
Diffstat (limited to 'gcc/gimple-fold.c')
| -rw-r--r-- | gcc/gimple-fold.c | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/gcc/gimple-fold.c b/gcc/gimple-fold.c index 9760b8a..13a6219 100644 --- a/gcc/gimple-fold.c +++ b/gcc/gimple-fold.c @@ -354,8 +354,8 @@ fold_gimple_assign (gimple_stmt_iterator *si) return val; } } - } + else if (TREE_CODE (rhs) == ADDR_EXPR) { tree ref = TREE_OPERAND (rhs, 0); @@ -370,21 +370,29 @@ fold_gimple_assign (gimple_stmt_iterator *si) else if (TREE_CODE (ref) == MEM_REF && integer_zerop (TREE_OPERAND (ref, 1))) result = fold_convert (TREE_TYPE (rhs), TREE_OPERAND (ref, 0)); + + if (result) + { + /* Strip away useless type conversions. Both the + NON_LVALUE_EXPR that may have been added by fold, and + "useless" type conversions that might now be apparent + due to propagation. */ + STRIP_USELESS_TYPE_CONVERSION (result); + + if (result != rhs && valid_gimple_rhs_p (result)) + return result; + } } else if (TREE_CODE (rhs) == CONSTRUCTOR - && TREE_CODE (TREE_TYPE (rhs)) == VECTOR_TYPE - && (CONSTRUCTOR_NELTS (rhs) - == TYPE_VECTOR_SUBPARTS (TREE_TYPE (rhs)))) + && TREE_CODE (TREE_TYPE (rhs)) == VECTOR_TYPE) { /* Fold a constant vector CONSTRUCTOR to VECTOR_CST. */ unsigned i; tree val; FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (rhs), i, val) - if (TREE_CODE (val) != INTEGER_CST - && TREE_CODE (val) != REAL_CST - && TREE_CODE (val) != FIXED_CST) + if (! CONSTANT_CLASS_P (val)) return NULL_TREE; return build_vector_from_ctor (TREE_TYPE (rhs), @@ -393,21 +401,6 @@ fold_gimple_assign (gimple_stmt_iterator *si) else if (DECL_P (rhs)) return get_symbol_constant_value (rhs); - - /* If we couldn't fold the RHS, hand over to the generic - fold routines. */ - if (result == NULL_TREE) - result = fold (rhs); - - /* Strip away useless type conversions. Both the NON_LVALUE_EXPR - that may have been added by fold, and "useless" type - conversions that might now be apparent due to propagation. */ - STRIP_USELESS_TYPE_CONVERSION (result); - - if (result != rhs && valid_gimple_rhs_p (result)) - return result; - - return NULL_TREE; } break; |