[PATCH] Fix PR c/6223

[Jakub Jelinek]

Hi!

The following patch fixes PR c/6223.
We'd create
(ior:QI (and:QI () ()) (const_int 128 [0x80]))
and fail sanity checks later on, since 128 is not a valid QImode constant.
Ok to commit (provided testing succeeds)?
Trunk patch attached below, with the obvious change to use gen_int_mode.

2002-04-11  Jakub Jelinek  <jakub@redhat.com>

	PR c/6223
	* combine.c (if_then_else_cond): Use trunc_int_for_mode on nz.

	* gcc.dg/20020411-1.c: New test.

--- gcc/combine.c.jj	Fri Apr  5 23:47:55 2002
+++ gcc/combine.c	Thu Apr 11 14:11:42 2002
@@ -7377,7 +7377,7 @@ if_then_else_cond (x, ptrue, pfalse)
 	   && GET_MODE_BITSIZE (mode) <= HOST_BITS_PER_WIDE_INT
 	   && exact_log2 (nz = nonzero_bits (x, mode)) >= 0)
     {
-      *ptrue = GEN_INT (nz), *pfalse = const0_rtx;
+      *ptrue = GEN_INT (trunc_int_for_mode (nz, mode)), *pfalse = const0_rtx;
       return x;
     }
 
--- gcc/testsuite/gcc.dg/20020411-1.c.jj	Thu Apr 11 14:13:45 2002
+++ gcc/testsuite/gcc.dg/20020411-1.c	Thu Apr 11 14:16:32 2002
@@ -0,0 +1,50 @@
+/* PR c/6223
+   This testcase ICEd in internal check because a constant was not truncated
+   for its mode.  */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+/* { dg-options "-O2 -march=i686" { target i?86-*-* } } */
+
+typedef struct
+{
+  unsigned a : 16;
+  unsigned b : 16;
+  unsigned c : 5;
+  unsigned d : 2;
+  unsigned e : 1;
+  unsigned f : 4;
+  unsigned g : 1;
+  unsigned h : 1;
+  unsigned i : 1;
+  unsigned j : 1;
+} T;
+
+inline void
+foo (T *x, unsigned int y)
+{
+  if ((x->j = (y >= 0x100000)))
+    y >>= 12;
+  x->a = y;
+  x->f = (y >> 16);
+}
+
+void __attribute__((noinline))
+bar (T *x)
+{
+}
+
+void
+baz (unsigned int x, unsigned char y)
+{
+  T t;
+
+  foo (&t, x - 1);
+  t.e = 1;
+  t.c = y;
+  t.g = 0;
+  t.h = 0;
+  t.i = (y & 0x40) != 0;
+  if (x == 1)
+    foo (&t, 1);
+  bar (&t);
+}

	Jakub
-------------- next part --------------
--- gcc/combine.c.jj	Fri Apr  5 23:47:55 2002
+++ gcc/combine.c	Thu Apr 11 14:11:42 2002
@@ -7377,7 +7377,7 @@ if_then_else_cond (x, ptrue, pfalse)
 	   && GET_MODE_BITSIZE (mode) <= HOST_BITS_PER_WIDE_INT
 	   && exact_log2 (nz = nonzero_bits (x, mode)) >= 0)
     {
-      *ptrue = GEN_INT (nz), *pfalse = const0_rtx;
+      *ptrue = gen_int_mode (nz, mode), *pfalse = const0_rtx;
       return x;
     }