Revert cant_combine_insn_p change.

gcc/

2011-02-15  H.J. Lu  <hongjiu.lu@intel.com>

	PR middle-end/47725
	* combine.c (cant_combine_insn_p): Revert the last change.

gcc/testsuite/

2011-02-15  H.J. Lu  <hongjiu.lu@intel.com>

	PR middle-end/47725
	* gcc.dg/torture/pr47725.c: Removed.

From-SVN: r170197

gcc/ChangeLog

+2011-02-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR middle-end/47725
+	* combine.c (cant_combine_insn_p): Revert the last change.
+
 2011-02-15  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	PR target/47755

gcc/combine.c

@@ -2137,12 +2137,6 @@ cant_combine_insn_p (rtx insn)
     return 0;
   src = SET_SRC (set);
   dest = SET_DEST (set);
-  if (GET_CODE (src) == ZERO_EXTEND
-      || GET_CODE (src) == SIGN_EXTEND)
-    src = XEXP (src, 0);
-  if (GET_CODE (dest) == ZERO_EXTEND
-      || GET_CODE (dest) == SIGN_EXTEND)
-    dest = XEXP (dest, 0);
   if (GET_CODE (src) == SUBREG)
     src = SUBREG_REG (src);
   if (GET_CODE (dest) == SUBREG)

gcc/testsuite/ChangeLog

+2011-02-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR middle-end/47725
+	* gcc.dg/torture/pr47725.c: Removed.
+
 2011-02-15  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	PR target/47755

gcc/testsuite/gcc.dg/torture/pr47725.c

-/* { dg-do compile } */
-
-struct _Unwind_Context
-{
-  void *reg[17];
-  void *ra;
-};
-extern void bar (struct _Unwind_Context *);
-void
-__frame_state_for (void *pc_target)
-{
-  struct _Unwind_Context context;
-  __builtin_memset (&context, 0, sizeof (struct _Unwind_Context));
-  context.ra = pc_target;
-  bar (&context);
-}