Avoid generating (plus X (const_int 0)) in plus_constant

Change-Id: Ib872a95424ba479bae09061b4d4680fac24ca527

diff --git a/gcc/explow.c b/gcc/explow.c
index 48e91a6..a30c97d 100644 (file)
--- a/gcc/explow.c
+++ b/gcc/explow.c
@@ -165,8 +165,11 @@ plus_constant (enum machine_mode mode, rtx x, HOST_WIDE_INT c)
 
       if (CONSTANT_P (XEXP (x, 1)))
        {
-         x = gen_rtx_PLUS (mode, XEXP (x, 0),
-                           plus_constant (mode, XEXP (x, 1), c));
+          rtx term = plus_constant (mode, XEXP (x, 1), c);
+          if (term == const0_rtx)
+            x = XEXP (x, 0);
+          else
+            x = gen_rtx_PLUS (mode, XEXP (x, 0), term);
          c = 0;
        }
       else if (find_constant_term_loc (&y))