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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9b425d24053f505bcb32a51744152b10eed62d8b..f07f6ce8a8295e69447ee36acbe4410f53f96686 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/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
+       * config/i386/i386.md (x86_mov<mode>cc_0_m1_neg): Add clobber.
+
 2012-04-20  Thomas Schwinge  <thomas@codesourcery.com>
 
        struct siginfo vs. siginfo_t

diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index ce7d7ffe2cc6272207d29ee0d7bd014cbee739b7..a0c74c495f1ad4372904b6eadd075d6590658450 100644 (file)
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -18557,7 +18557,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 ca046fcaef5a51820cb00b38f76beddbd0c13f6f..e870e5cec3b147ed8e45ddba9c7766e7046276f8 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-03-28  Martin Jambor  <mjambor@suse.cz>
 
        Backported from mainline

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;
+}