2019-08-05 Arvind Sankar <nived...@alum.mit.edu>
gcc/ChangeLog:
* config/darwin.c: Convert GET_CODE (..) == CONST_WIDE_INT
to CONST_WIDE_INT_P (..).
* config/s390/s390.c: Likewise.
* rtlanal.c: Likewise.
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index d38867e4227..6eaccd73a9f 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -1751,19 +1751,19 @@ machopic_select_rtx_section (machine_mode mode, rtx x,
{
if (GET_MODE_SIZE (mode) == 8
&& (CONST_INT_P (x)
- || GET_CODE (x) == CONST_WIDE_INT
+ || CONST_WIDE_INT_P (x)
|| GET_CODE (x) == CONST_DOUBLE))
return darwin_sections[literal8_section];
else if (GET_MODE_SIZE (mode) == 4
&& (CONST_INT_P (x)
- || GET_CODE (x) == CONST_WIDE_INT
+ || CONST_WIDE_INT_P (x)
|| GET_CODE (x) == CONST_DOUBLE))
return darwin_sections[literal4_section];
else if (HAVE_GAS_LITERAL16
&& TARGET_64BIT
&& GET_MODE_SIZE (mode) == 16
&& (CONST_INT_P (x)
- || GET_CODE (x) == CONST_WIDE_INT
+ || CONST_WIDE_INT_P (x)
|| GET_CODE (x) == CONST_DOUBLE
|| GET_CODE (x) == CONST_VECTOR))
return darwin_sections[literal16_section];
diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index c863514325a..4c55707367d 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -4187,7 +4187,7 @@ legitimate_reload_constant_p (rtx op)
return true;
/* Accept double-word operands that can be split. */
- if (GET_CODE (op) == CONST_WIDE_INT
+ if (CONST_WIDE_INT_P (op)
|| (CONST_INT_P (op)
&& trunc_int_for_mode (INTVAL (op), word_mode) != INTVAL (op)))
{
@@ -4418,7 +4418,7 @@ s390_reload_symref_address (rtx reg, rtx mem, rtx
scratch, bool tomem)
/* Reload might have pulled a constant out of the literal pool.
Force it back in. */
if (CONST_INT_P (mem) || GET_CODE (mem) == CONST_DOUBLE
- || GET_CODE (mem) == CONST_WIDE_INT
+ || CONST_WIDE_INT_P (mem)
|| GET_CODE (mem) == CONST_VECTOR
|| GET_CODE (mem) == CONST)
mem = force_const_mem (GET_MODE (reg), mem);
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index 268a38799d6..7da11b399ba 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -6051,7 +6051,7 @@ split_double (rtx value, rtx *first, rtx *second)
}
}
}
- else if (GET_CODE (value) == CONST_WIDE_INT)
+ else if (CONST_WIDE_INT_P (value))
{
/* All of this is scary code and needs to be converted to
properly work with any size integer. */
--
2.21.0
