[Committed] PR14261 ifcvt: Handle INSV patterns properly when a temp reg is needed

Andreas Krebbel krebbel1@de.ibm.com
Wed Apr 19 11:58:00 GMT 2006


Hello,

> There is one issue I see.  There is a line
> !             unsigned HOST_WIDE_INT size = INTVAL (XEXP (x, 1));
> but nowhere do we verify that this is a CONST_INT before we apply
> INTVAL.  We do verify that XEXP (x, 2) is a CONST_INT before using
> INTVAL.  So I think that code should be extended to also check XEXP (x,
> 1).

Ok I've committed the attached patch to mainline.

The testcase I've checked in doesn't produce the ICE which occurred without
the patch. However gcc creates wrong code for it without:
http://gcc.gnu.org/ml/gcc-patches/2006-03/msg01793.html

Bye,

-Andreas-

2006-04-19  Andreas Krebbel  <krebbel1@de.ibm.com>

	PR rtl-optimization/14261
	* ifcvt.c (noce_emit_move_insn): Call store_bit_field if the resulting
	move would be an INSV insn.
	(noce_process_if_block): Don't optimize if the destination is a 
	ZERO_EXTRACT which can't be handled by noce_emit_move_insn.

2006-04-19  Andreas Krebbel  <krebbel1@de.ibm.com>

	PR rtl-optimization/14261
	* gcc.c-torture/compile/20060419-1.c: Added.


Index: gcc/ifcvt.c
===================================================================
*** gcc/ifcvt.c.orig	2006-04-07 12:34:23.000000000 +0200
--- gcc/ifcvt.c	2006-04-18 13:44:49.000000000 +0200
*************** noce_emit_move_insn (rtx x, rtx y)
*** 702,748 ****
        end_sequence();
  
        if (recog_memoized (insn) <= 0)
! 	switch (GET_RTX_CLASS (GET_CODE (y)))
! 	  {
! 	  case RTX_UNARY:
! 	    ot = code_to_optab[GET_CODE (y)];
! 	    if (ot)
! 	      {
! 		start_sequence ();
! 		target = expand_unop (GET_MODE (y), ot, XEXP (y, 0), x, 0);
! 		if (target != NULL_RTX)
! 		  {
! 		    if (target != x)
! 		      emit_move_insn (x, target);
! 		    seq = get_insns ();
! 		  }
! 		end_sequence ();
! 	      }
! 	    break;
! 
! 	  case RTX_BIN_ARITH:
! 	  case RTX_COMM_ARITH:
! 	    ot = code_to_optab[GET_CODE (y)];
! 	    if (ot)
! 	      {
! 		start_sequence ();
! 		target = expand_binop (GET_MODE (y), ot,
! 				       XEXP (y, 0), XEXP (y, 1),
! 				       x, 0, OPTAB_DIRECT);
! 		if (target != NULL_RTX)
! 		  {
! 		    if (target != x)
! 		      emit_move_insn (x, target);
! 		    seq = get_insns ();
! 		  }
! 		end_sequence ();
! 	      }
! 	    break;
  
! 	  default:
! 	    break;
! 	  }
  
        emit_insn (seq);
        return;
      }
--- 702,777 ----
        end_sequence();
  
        if (recog_memoized (insn) <= 0)
! 	{
! 	  if (GET_CODE (x) == ZERO_EXTRACT)
! 	    {
! 	      rtx op = XEXP (x, 0);
! 	      unsigned HOST_WIDE_INT size = INTVAL (XEXP (x, 1));
! 	      unsigned HOST_WIDE_INT start = INTVAL (XEXP (x, 2));
! 
! 	      /* store_bit_field expects START to be relative to 
! 		 BYTES_BIG_ENDIAN and adjusts this value for machines with 
! 		 BITS_BIG_ENDIAN != BYTES_BIG_ENDIAN.  In order to be able to 
! 		 invoke store_bit_field again it is necessary to have the START
! 		 value from the first call.  */
! 	      if (BITS_BIG_ENDIAN != BYTES_BIG_ENDIAN)
! 		{
! 		  if (MEM_P (op))
! 		    start = BITS_PER_UNIT - start - size;
! 		  else
! 		    {
! 		      gcc_assert (REG_P (op));
! 		      start = BITS_PER_WORD - start - size;
! 		    }
! 		}
  
! 	      gcc_assert (start < (MEM_P (op) ? BITS_PER_UNIT : BITS_PER_WORD));
! 	      store_bit_field (op, size, start, GET_MODE (x), y);
! 	      return;
! 	    }
  
+ 	  switch (GET_RTX_CLASS (GET_CODE (y)))
+ 	    {
+ 	    case RTX_UNARY:
+ 	      ot = code_to_optab[GET_CODE (y)];
+ 	      if (ot)
+ 		{
+ 		  start_sequence ();
+ 		  target = expand_unop (GET_MODE (y), ot, XEXP (y, 0), x, 0);
+ 		  if (target != NULL_RTX)
+ 		    {
+ 		      if (target != x)
+ 			emit_move_insn (x, target);
+ 		      seq = get_insns ();
+ 		    }
+ 		  end_sequence ();
+ 		}
+ 	      break;
+ 	      
+ 	    case RTX_BIN_ARITH:
+ 	    case RTX_COMM_ARITH:
+ 	      ot = code_to_optab[GET_CODE (y)];
+ 	      if (ot)
+ 		{
+ 		  start_sequence ();
+ 		  target = expand_binop (GET_MODE (y), ot,
+ 					 XEXP (y, 0), XEXP (y, 1),
+ 					 x, 0, OPTAB_DIRECT);
+ 		  if (target != NULL_RTX)
+ 		    {
+ 		      if (target != x)
+ 			  emit_move_insn (x, target);
+ 		      seq = get_insns ();
+ 		    }
+ 		  end_sequence ();
+ 		}
+ 	      break;
+ 	      
+ 	    default:
+ 	      break;
+ 	    }
+ 	}
+       
        emit_insn (seq);
        return;
      }
*************** noce_process_if_block (struct ce_if_bloc
*** 2231,2236 ****
--- 2260,2271 ----
      {
        if (no_new_pseudos || GET_MODE (x) == BLKmode)
  	return FALSE;
+ 
+       if (GET_MODE (x) == ZERO_EXTRACT 
+ 	  && (GET_CODE (XEXP (x, 1)) != CONST_INT 
+ 	      || GET_CODE (XEXP (x, 2)) != CONST_INT))
+ 	return FALSE;
+ 	  
        x = gen_reg_rtx (GET_MODE (GET_CODE (x) == STRICT_LOW_PART
  				 ? XEXP (x, 0) : x));
      }
Index: gcc/testsuite/gcc.c-torture/compile/20060419-1.c
===================================================================
*** /dev/null	1970-01-01 00:00:00.000000000 +0000
--- gcc/testsuite/gcc.c-torture/compile/20060419-1.c	2006-04-18 13:33:10.000000000 +0200
***************
*** 0 ****
--- 1,21 ----
+ /* This failed because if conversion didn't handle insv patterns properly.  */
+ 
+ union y
+ {
+   int a;
+   unsigned short b;
+ };
+ 
+ extern void bar (unsigned short u, union y v);
+ 
+ void
+ foo (int check)
+ {
+   union y x;
+ 
+   if (check != 0)
+     x.b = 1;
+   else
+     x.b = 2;
+   bar (x.b, x);
+ }



More information about the Gcc-patches mailing list