From: Tom de Vries <tom@codesourcery.com>
Date: Mon, 20 Nov 2017 08:20:35 +0000 (+0000)
Subject: Fix comparison mode in simplify_ternary_operation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7cfaa4c643eabd8d5aaa74a8406f0bf4880b8fe6;p=gcc.git

Fix comparison mode in simplify_ternary_operation

2017-11-20  Tom de Vries  <tom@codesourcery.com>

	PR rtl-optimization/82020
	* simplify-rtx.c (simplify_ternary_operation): Fix comparison mode of
	IF_THEN_ELSE condition.

From-SVN: r254944
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5ce981d0871..827ee608029 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-20  Tom de Vries  <tom@codesourcery.com>
+
+	PR rtl-optimization/82020
+	* simplify-rtx.c (simplify_ternary_operation): Fix comparison mode of
+	IF_THEN_ELSE condition.
+
 2017-11-19  Jeff Law  <law@redhat.com>
 
 	* tree-ssa-dom.c (record_equivalences_from_phis): Fix handling
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index e1a16a46a4c..36a2e370293 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -5651,8 +5651,6 @@ simplify_ternary_operation (enum rtx_code code, machine_mode mode,
 					      XEXP (op0, 0), XEXP (op0, 1));
 	    }
 
-	  if (cmp_mode == VOIDmode)
-	    cmp_mode = op0_mode;
 	  temp = simplify_relational_operation (GET_CODE (op0), op0_mode,
 			  			cmp_mode, XEXP (op0, 0),
 						XEXP (op0, 1));