rs6000: fix for PR61396 (wide-int fallout)

CONSTANT_P is true for more than just all kinds of constant number.
This patch undoes that part of the wide-int patches.

From-SVN: r212932

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00b4cf16592a48286d75dbdf5d29bb03be2757ca..13d0a21bb9b8077fa2d48b16ce3e1629262318ba 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-23  Segher Boessenkool  <segher@kernel.crashing.org>
+
+       PR target/61396
+       * config/rs6000/rs6000.c (paired_expand_vector_init): Only allow
+       constant numbers, not general constants.
+       (rs6000_expand_vector_init): Ditto.
+
 2014-07-23  Nathan Sidwell  <nathan@acm.org>
 
        * gcov-tool.c (gcov_list): Declare here.

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 3b692f0f3ba1a83c080e4f79f6c40dad618fc7b6..d7bd9701aec9f5c8bc04e6cfa2bd135f26985838 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -5320,7 +5320,7 @@ paired_expand_vector_init (rtx target, rtx vals)
   for (i = 0; i < n_elts; ++i)
     {
       x = XVECEXP (vals, 0, i);
-      if (!CONSTANT_P (x))
+      if (!(CONST_SCALAR_INT_P (x) || CONST_DOUBLE_P (x) || CONST_FIXED_P (x)))
        ++n_var;
     }
   if (n_var == 0)
@@ -5472,7 +5472,7 @@ rs6000_expand_vector_init (rtx target, rtx vals)
   for (i = 0; i < n_elts; ++i)
     {
       x = XVECEXP (vals, 0, i);
-      if (!CONSTANT_P (x))
+      if (!(CONST_SCALAR_INT_P (x) || CONST_DOUBLE_P (x) || CONST_FIXED_P (x)))
        ++n_var, one_var = i;
       else if (x != CONST0_RTX (inner_mode))
        all_const_zero = false;