From 9eb5455884dc17327a98a395ca148c254c2a908d Mon Sep 17 00:00:00 2001
From: Richard Sandiford <rsandifo@redhat.com>
Date: Fri, 26 Sep 2003 06:05:48 +0000
Subject: [PATCH] * combine.c (if_then_else_cond): Tighten mode check.

From-SVN: r71815
---
 gcc/ChangeLog | 4 ++++
 gcc/combine.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0051408dee0c..6ead1c02d1bb 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-26  Richard Sandiford  <rsandifo@redhat.com>
+
+	* combine.c (if_then_else_cond): Tighten mode check.
+
 2003-09-25  Nathanael Nerode  <neroden@gcc.gnu.org>
 
 	* cppcharset.c, cpphash.h: Rename 'struct strbuf' to
diff --git a/gcc/combine.c b/gcc/combine.c
index c18c36e80917..3a3d9223d9fd 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -7422,7 +7422,7 @@ if_then_else_cond (rtx x, rtx *ptrue, rtx *pfalse)
     }
 
   /* Likewise for 0 or a single bit.  */
-  else if (mode != VOIDmode
+  else if (SCALAR_INT_MODE_P (mode)
 	   && GET_MODE_BITSIZE (mode) <= HOST_BITS_PER_WIDE_INT
 	   && exact_log2 (nz = nonzero_bits (x, mode)) >= 0)
     {