* tree-affine.c (tree_to_aff_combination): Handle (T1)(X + X).

From-SVN: r248956

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4222568edcc4b728316bdcc5a1e614f0dce938cf..b2d723250d40b07cecd8e263496487d75b4c2531 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2017-06-07  Bin Cheng  <bin.cheng@arm.com>
+
+       * tree-affine.c (tree_to_aff_combination): Handle (T1)(X + X).
+
 2017-06-07  Bin Cheng  <bin.cheng@arm.com>
 
        (aff_combination_expand): Move (T1)(X *+- CST) simplification to ...

diff --git a/gcc/tree-affine.c b/gcc/tree-affine.c
index cbe2bdb4b6ac1b8e0979c20da567f563a6092057..d2983ab5e8a892e778e64baa81803691a757b2ec 100644 (file)
--- a/gcc/tree-affine.c
+++ b/gcc/tree-affine.c
@@ -375,17 +375,24 @@ tree_to_aff_combination (tree expr, tree type, aff_tree *comb)
        if ((icode == PLUS_EXPR || icode == MINUS_EXPR || icode == MULT_EXPR)
            && TREE_CODE (itype) == INTEGER_TYPE
            && TREE_CODE (otype) == INTEGER_TYPE
-           && TYPE_PRECISION (otype) > TYPE_PRECISION (itype)
-           && TYPE_OVERFLOW_UNDEFINED (itype)
-           && TREE_CODE (TREE_OPERAND (inner, 1)) == INTEGER_CST)
+           && TYPE_PRECISION (otype) > TYPE_PRECISION (itype))
          {
-           /* Convert (T1)(X *+- CST) into (T1)X *+- (T1)CST if X's type has
-              undefined overflow behavior.  */
-           tree op0 = fold_convert (otype, TREE_OPERAND (inner, 0));
-           tree op1 = fold_convert (otype, TREE_OPERAND (inner, 1));
-           expr = fold_build2 (icode, otype, op0, op1);
-           tree_to_aff_combination (expr, type, comb);
-           return;
+           tree op0 = TREE_OPERAND (inner, 0), op1 = TREE_OPERAND (inner, 1);
+
+           /* If inner type has undefined overflow behavior, fold conversion
+              for below two cases:
+                (T1)(X *+- CST) -> (T1)X *+- (T1)CST
+                (T1)(X + X)     -> (T1)X + (T1)X.  */
+           if (TYPE_OVERFLOW_UNDEFINED (itype)
+               && (TREE_CODE (op1) == INTEGER_CST
+                   || (icode == PLUS_EXPR && operand_equal_p (op0, op1, 0))))
+             {
+               op0 = fold_convert (otype, op0);
+               op1 = fold_convert (otype, op1);
+               expr = fold_build2 (icode, otype, op0, op1);
+               tree_to_aff_combination (expr, type, comb);
+               return;
+             }
          }
       }
       break;