MIPS: Fix wrong use of XINT instead of INTVAL

This issue was caught with assert checking enabled but is not a
functional bug as XINT(x, 0) happens to overlay INTVAL(x) anyway.

gcc/
	* config/mips/mips.c (mips_final_prescan_insn): Fix incorrect
	XINT with INTVAL.
	(mips_final_postscan_insn): Likewise.

From-SVN: r258099

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b934c83949a06f690185ba1ad30bd4555373d6e2..447ea67aaf95b6a8591dad5d5708c6351ec9c644 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-01  Matthew Fortune  <mfortune@gmail.com>
+
+       * config/mips/mips.c (mips_final_prescan_insn): Fix incorrect
+       XINT with INTVAL.
+       (mips_final_postscan_insn): Likewise.
+
 2018-03-01  Richard Sandiford  <richard.sandiford@linaro.org>
 
        PR rtl-optimization/84528

diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 00cece2fa0915419483fa96f97d709e83083e8e0..aabd4b1580fa897ac2ee4caca99aba48801985bf 100644 (file)
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -20426,7 +20426,7 @@ mips_final_prescan_insn (rtx_insn *insn, rtx *opvec, int noperands)
       && GET_CODE (PATTERN (insn)) == UNSPEC_VOLATILE
       && XINT (PATTERN (insn), 1) == UNSPEC_CONSTTABLE)
     mips_set_text_contents_type (asm_out_file, "__pool_",
-                                XINT (XVECEXP (PATTERN (insn), 0, 0), 0),
+                                INTVAL (XVECEXP (PATTERN (insn), 0, 0)),
                                 FALSE);
 
   if (mips_need_noat_wrapper_p (insn, opvec, noperands))
@@ -20450,7 +20450,7 @@ mips_final_postscan_insn (FILE *file ATTRIBUTE_UNUSED, rtx_insn *insn,
       && GET_CODE (PATTERN (insn)) == UNSPEC_VOLATILE
       && XINT (PATTERN (insn), 1) == UNSPEC_CONSTTABLE_END)
     mips_set_text_contents_type (asm_out_file, "__pend_",
-                                XINT (XVECEXP (PATTERN (insn), 0, 0), 0),
+                                INTVAL (XVECEXP (PATTERN (insn), 0, 0)),
                                 TRUE);
 }