combine.c (combine_simplify_rtx): If the modes are all VOIDmode, check the…

combine.c (combine_simplify_rtx): If the modes are all VOIDmode, check the original operand's mode also.

* combine.c (combine_simplify_rtx): If the modes are all VOIDmode,
check the original operand's mode also.
* simplify-rtx.c (simplify_ternary_operation): Ditto.

From-SVN: r39247

gcc/ChangeLog

+2001-01-24  DJ Delorie  <dj@redhat.com>
+
+	* combine.c (combine_simplify_rtx): If the modes are all VOIDmode,
+	check the original operand's mode also.
+	* simplify-rtx.c (simplify_ternary_operation): Ditto.
+
 2001-01-24  Joseph S. Myers  <jsm28@cam.ac.uk>
 
 	* c-parse.in (cast_expr): Move compound literals from here ...

gcc/combine.c

@@ -3654,7 +3654,11 @@ combine_simplify_rtx (x, op0_mode, last, in_dest)
       {
 	enum machine_mode cmp_mode = GET_MODE (XEXP (x, 0));
 	if (cmp_mode == VOIDmode)
-	  cmp_mode = GET_MODE (XEXP (x, 1));
+	  {
+	    cmp_mode = GET_MODE (XEXP (x, 1));
+	    if (cmp_mode == VOIDmode)
+	      cmp_mode = op0_mode;
+	  }
 	temp = simplify_relational_operation (code, cmp_mode,
 					      XEXP (x, 0), XEXP (x, 1));
       }

gcc/simplify-rtx.c

@@ -2057,6 +2057,8 @@ simplify_ternary_operation (code, mode, op0_mode, op0, op1, op2)
 	  enum machine_mode cmp_mode = (GET_MODE (XEXP (op0, 0)) == VOIDmode
 					? GET_MODE (XEXP (op0, 1))
 					: GET_MODE (XEXP (op0, 0)));
+	  if (cmp_mode == VOIDmode)
+	    cmp_mode = op0_mode;
 	  rtx temp
 	     = simplify_relational_operation (GET_CODE (op0), cmp_mode,
 					      XEXP (op0, 0), XEXP (op0, 1));