backport: re PR target/53138 (spaceship operator miscompiled)

	Backport from mainline
	2012-04-27  Paolo Bonzini  <bonzini@gnu.org>

	PR target/53138
	* config/i386/i386.md (x86_mov<mode>cc_0_m1_neg): Add clobber.

testsuite/ChangeLog:

	Backport from mainline
	2012-04-27  Paolo Bonzini  <bonzini@gnu.org>

	PR target/53138
	* gcc.c-torture/execute/20120427-1.c: New testcase.

From-SVN: r186963

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 268edbc3cba4c138d308838d8de7bc00b161fb40..7db206adc22d3be928c2e50fb6c740b7dd4246d2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,8 +1,15 @@
+2012-04-30  Uros Bizjak  <ubizjak@gmail.com>
+
+       Backport from mainline
+       2012-04-27  Paolo Bonzini  <bonzini@gnu.org>
+
+       PR target/53138
+       * config/i386/i386.md (x86_mov<mode>cc_0_m1_neg): Add clobber.
+
 2012-04-24  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/53084
-       * varasm.c (compute_reloc_for_constant): Handle ADDR_EXPR
-       of MEM_REF.
+       * varasm.c (compute_reloc_for_constant): Handle ADDR_EXPR of MEM_REF.
        (output_addressed_constants): Likewise.
 
 2012-04-20  Thomas Schwinge  <thomas@codesourcery.com>

diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 2067674f59fae1d305a442154cd74d7f42c90a7f..42efde0d58e16d40dcbbbf7b5ab5b55464a5427e 100644 (file)
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -16349,7 +16349,8 @@
 (define_insn "*x86_mov<mode>cc_0_m1_neg"
   [(set (match_operand:SWI48 0 "register_operand" "=r")
        (neg:SWI48 (match_operator 1 "ix86_carry_flag_operator"
-                   [(reg FLAGS_REG) (const_int 0)])))]
+                   [(reg FLAGS_REG) (const_int 0)])))
+   (clobber (reg:CC FLAGS_REG))]
   ""
   "sbb{<imodesuffix>}\t%0, %0"
   [(set_attr "type" "alu")

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c1c1ce9beadbb18294997c78536d307045944e4a..f599a5424111c5b7adefa1c61ac5773ddafa516a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2012-04-30  Uros Bizjak  <ubizjak@gmail.com>
+
+       Backport from mainline
+       2012-04-27  Paolo Bonzini  <bonzini@gnu.org>
+
+       PR target/53138
+       * gcc.c-torture/execute/20120427-1.c: New testcase.
+
 2012-04-24  Jakub Jelinek  <jakub@redhat.com>
 
        PR middle-end/53084

diff --git a/gcc/testsuite/gcc.c-torture/execute/20120427-1.c b/gcc/testsuite/gcc.c-torture/execute/20120427-1.c
new file mode 100644 (file)
index 0000000..46ed76a
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/20120427-1.c
@@ -0,0 +1,36 @@
+typedef struct sreal
+{
+  unsigned sig;                /* Significant.  */
+  int exp;             /* Exponent.  */
+} sreal;
+
+sreal_compare (sreal *a, sreal *b)
+{
+  if (a->exp > b->exp)
+    return 1;
+  if (a->exp < b->exp)
+    return -1;
+  if (a->sig > b->sig)
+    return 1;
+  return -(a->sig < b->sig);
+}
+
+sreal a[] = {
+   { 0, 0 },
+   { 1, 0 },
+   { 0, 1 },
+   { 1, 1 }
+};
+
+int main()
+{
+  int i, j;
+  for (i = 0; i <= 3; i++) {
+    for (j = 0; j < 3; j++) {
+      if (i < j && sreal_compare(&a[i], &a[j]) != -1) abort();
+      if (i == j && sreal_compare(&a[i], &a[j]) != 0) abort();
+      if (i > j && sreal_compare(&a[i], &a[j]) != 1) abort();
+    }
+  }
+  return 0;
+}