From: Dragan Mladjenovic <dmladjenovic@wavecomp.com>
Date: Wed, 13 Nov 2019 19:20:15 +0000 (+0000)
Subject: Sanitize the constant argument for rotr<mode>3
X-Git-Tag: releases/gcc-9.3.0~391
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8449384f332b58a2d2f1e268afbfb25e8584339;p=thirdparty%2Fgcc.git

Sanitize the constant argument for rotr<mode>3

This was dormant for quite some time, but it started happening for me
on gcc.c-torture/compile/pr65153.c sometime after r276645 for -mabi=32 linux runs.

The pattern accepts any SMALL_OPERAND constant value while it asserts during the final
that the value is in the mode size range. I this case it happens that combine_and_move_insns
during ira makes a pattern with negative "shift count" which fails at final stage.

This simple fix just truncates the constant operand to mode size the same as shift patterns.

gcc/ChangeLog:

2019-11-13  Dragan Mladjenovic  <dmladjenovic@wavecomp.com>

	Backport from mainline
	* config/mips/mips.md (rotr<mode>3): Sanitize the constant argument
	instead of asserting its value.

From-SVN: r278154
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c0ef3795017f..400e02fae59f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-13  Dragan Mladjenovic  <dmladjenovic@wavecomp.com>
+
+	Backport from mainline
+	* config/mips/mips.md (rotr<mode>3): Sanitize the constant argument
+	instead of asserting its value.
+
 2019-11-11  Richard Biener  <rguenther@suse.de>
 
 	Backport from mainline
diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md
index a9b0c86be07a..3cfb1a751e9b 100644
--- a/gcc/config/mips/mips.md
+++ b/gcc/config/mips/mips.md
@@ -5836,8 +5836,8 @@
   "ISA_HAS_ROR"
 {
   if (CONST_INT_P (operands[2]))
-    gcc_assert (INTVAL (operands[2]) >= 0
-		&& INTVAL (operands[2]) < GET_MODE_BITSIZE (<MODE>mode));
+    operands[2] = GEN_INT (INTVAL (operands[2])
+                           & (GET_MODE_BITSIZE (<MODE>mode) - 1));
 
   return "<d>ror\t%0,%1,%2";
 }