2019-08-05 Arvind Sankar <nived...@alum.mit.edu> gcc/ChangeLog:
* cfgexpand.c: Convert GET_CODE (..) == CONST_FIXED to CONST_FIXED_P. * config/spu/spu.c: Likewise. * varasm.c: Likewise. 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 33af991573f..b141a57d3af 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -5481,7 +5481,7 @@ expand_debug_locations (void) gcc_assert (mode == GET_MODE (val) || (GET_MODE (val) == VOIDmode && (CONST_SCALAR_INT_P (val) - || GET_CODE (val) == CONST_FIXED + || CONST_FIXED_P (val) || GET_CODE (val) == LABEL_REF))); } diff --git a/gcc/config/spu/spu.c b/gcc/config/spu/spu.c index 0e21e28b2e7..e6b25ab3b98 100644 --- a/gcc/config/spu/spu.c +++ b/gcc/config/spu/spu.c @@ -5985,7 +5985,7 @@ spu_expand_vector_init (rtx target, rtx vals) x = XVECEXP (vals, 0, i); if (!(CONST_INT_P (x) || GET_CODE (x) == CONST_DOUBLE - || GET_CODE (x) == CONST_FIXED)) + || CONST_FIXED_P (x))) ++n_var; else { @@ -6026,7 +6026,7 @@ spu_expand_vector_init (rtx target, rtx vals) x = XVECEXP (constant_parts_rtx, 0, i); if (!(CONST_INT_P (x) || GET_CODE (x) == CONST_DOUBLE - || GET_CODE (x) == CONST_FIXED)) + || CONST_FIXED_P (x))) XVECEXP (constant_parts_rtx, 0, i) = first_constant; } @@ -6046,7 +6046,7 @@ spu_expand_vector_init (rtx target, rtx vals) x = XVECEXP (vals, 0, i); if (!(CONST_INT_P (x) || GET_CODE (x) == CONST_DOUBLE - || GET_CODE (x) == CONST_FIXED)) + || CONST_FIXED_P (x))) { if (!register_operand (x, GET_MODE (x))) x = force_reg (GET_MODE (x), x); diff --git a/gcc/varasm.c b/gcc/varasm.c index e886cdc71b8..0e833b9bc58 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -2813,7 +2813,7 @@ assemble_integer (rtx x, unsigned int size, unsigned int align, int force) subsize = size > UNITS_PER_WORD? UNITS_PER_WORD : 1; subalign = MIN (align, subsize * BITS_PER_UNIT); - if (GET_CODE (x) == CONST_FIXED) + if (CONST_FIXED_P (x)) mclass = GET_MODE_CLASS (GET_MODE (x)); else mclass = MODE_INT; -- 2.21.0