From: H.J. Lu <hongjiu.lu@intel.com>
Date: Tue, 15 Feb 2011 19:46:26 +0000 (+0000)
Subject: Revert cant_combine_insn_p change.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4e380b8e008d8e8d2e2d8033fdbea3ee88c2665d;p=gcc.git

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
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 599b09c7984..564fe926039 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/gcc/combine.c b/gcc/combine.c
index 67aecf15100..f9d33b3d539 100644
--- a/gcc/combine.c
+++ b/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)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 64bd46ad49b..d6834fbdb6b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/gcc/testsuite/gcc.dg/torture/pr47725.c b/gcc/testsuite/gcc.dg/torture/pr47725.c
deleted file mode 100644
index 03d5d36c321..00000000000
--- a/gcc/testsuite/gcc.dg/torture/pr47725.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* { 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);
-}