re PR target/42113 (Internal Compiler error with -O3, breaking commit known)

	PR target/42113
	* config/alpha/alpha.md (*cmp_sadd_si): Change mode
	of scratch register to SImode.
	(*cmp_sadd_sidi): Ditto.
	(*cmp_ssub_si): Ditto.
	(*cmp_ssub_sidi): Ditto.

testsuite/ChangeLog:

	PR target/42113
	* gcc.target/alpha/pr42113.c: New test.

From-SVN: r154465

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6b8bb8da5e76c4c4b3fe88b2c66a163b491bb140..ddced7de0373e60d619db211df7c0e5f5211d3f5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-23  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR target/42113
+       * config/alpha/alpha.md (*cmp_sadd_si): Change mode
+       of scratch register to SImode.
+       (*cmp_sadd_sidi): Ditto.
+       (*cmp_ssub_si): Ditto.
+       (*cmp_ssub_sidi): Ditto.
+
 2009-11-17  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
        * config/spu/spu.c (get_pic_reg): Use LAST_ARG_REGNUM as PIC

diff --git a/gcc/config/alpha/alpha.md b/gcc/config/alpha/alpha.md
index 831a6983b66990532bb8cf3b9f94a7f35a0b27cc..72a8f2f2685ea9208e137b053324924917239c9e 100644 (file)
--- a/gcc/config/alpha/alpha.md
+++ b/gcc/config/alpha/alpha.md
@@ -4349,7 +4349,7 @@
                 (match_dup 4)))]
 {
   if (can_create_pseudo_p ())
-    operands[5] = gen_reg_rtx (DImode);
+    operands[5] = gen_reg_rtx (SImode);
   else if (reg_overlap_mentioned_p (operands[5], operands[4]))
     operands[5] = operands[0];
 })
@@ -4375,9 +4375,9 @@
                                 (match_dup 4))))]
 {
   if (can_create_pseudo_p ())
-    operands[5] = gen_reg_rtx (DImode);
+    operands[5] = gen_reg_rtx (SImode);
   else if (reg_overlap_mentioned_p (operands[5], operands[4]))
-    operands[5] = operands[0];
+    operands[5] = gen_lowpart (SImode, operands[0]);
 })
 
 (define_insn_and_split "*cmp_ssub_di"
@@ -4425,7 +4425,7 @@
                 (match_dup 4)))]
 {
   if (can_create_pseudo_p ())
-    operands[5] = gen_reg_rtx (DImode);
+    operands[5] = gen_reg_rtx (SImode);
   else if (reg_overlap_mentioned_p (operands[5], operands[4]))
     operands[5] = operands[0];
 })
@@ -4451,9 +4451,9 @@
                                  (match_dup 4))))]
 {
   if (can_create_pseudo_p ())
-    operands[5] = gen_reg_rtx (DImode);
+    operands[5] = gen_reg_rtx (SImode);
   else if (reg_overlap_mentioned_p (operands[5], operands[4]))
-    operands[5] = operands[0];
+    operands[5] = gen_lowpart (SImode, operands[0]);
 })
 \f
 ;; Here are the CALL and unconditional branch insns.  Calls on NT and OSF

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6a7b77ad0b1506636d9bc8b3b1d70f05e02a1a34..787834528210251183f48928d85b4a7efbb32642 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-23  Uros Bizjak  <ubizjak@gmail.com>
+
+       PR target/42113
+       * gcc.target/alpha/pr42113.c: New test.
+
 2009-11-20  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        PR libgfortran/42090

diff --git a/gcc/testsuite/gcc.target/alpha/pr42113.c b/gcc/testsuite/gcc.target/alpha/pr42113.c
new file mode 100644 (file)
index 0000000..228c14a
--- /dev/null
+++ b/gcc/testsuite/gcc.target/alpha/pr42113.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+int foo (int a, int b)
+{
+  int bar = a * sizeof (int);
+
+  if (b)
+    bar += sizeof (int);
+
+  return bar;
+}