diff options
| author | Segher Boessenkool <segher@kernel.crashing.org> | 2014-07-23 14:35:16 +0200 |
|---|---|---|
| committer | Segher Boessenkool <segher@gcc.gnu.org> | 2014-07-23 14:35:16 +0200 |
| commit | b50a9d38941a6a3aa42b9a9e89c5bf5dfb509ed1 (patch) | |
| tree | b758b55cb5b7633fe73a8f45a6bd923cdb79a63b /gcc | |
| parent | d10ee722fd82c07ada865db142fffec1a992295b (diff) | |
| download | gcc-b50a9d38941a6a3aa42b9a9e89c5bf5dfb509ed1.zip gcc-b50a9d38941a6a3aa42b9a9e89c5bf5dfb509ed1.tar.gz gcc-b50a9d38941a6a3aa42b9a9e89c5bf5dfb509ed1.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 00b4cf1..13d0a21 100644 --- 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 3b692f0..d7bd970 100644 --- 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; |