From d02810cda641206b4eb6e6c13db846bf771db67b Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Mon, 30 Apr 2012 11:56:27 +0200 Subject: [PATCH] backport: re PR target/53138 (spaceship operator miscompiled) Backport from mainline 2012-04-27 Paolo Bonzini PR target/53138 * config/i386/i386.md (x86_movcc_0_m1_neg): Add clobber. testsuite/ChangeLog: Backport from mainline 2012-04-27 Paolo Bonzini PR target/53138 * gcc.c-torture/execute/20120427-1.c: New testcase. From-SVN: r186963 --- gcc/ChangeLog | 11 ++++-- gcc/config/i386/i386.md | 3 +- gcc/testsuite/ChangeLog | 8 +++++ .../gcc.c-torture/execute/20120427-1.c | 36 +++++++++++++++++++ 4 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.c-torture/execute/20120427-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 268edbc3cba4..7db206adc22d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,8 +1,15 @@ +2012-04-30 Uros Bizjak + + Backport from mainline + 2012-04-27 Paolo Bonzini + + PR target/53138 + * config/i386/i386.md (x86_movcc_0_m1_neg): Add clobber. + 2012-04-24 Jakub Jelinek 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 diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 2067674f59fa..42efde0d58e1 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -16349,7 +16349,8 @@ (define_insn "*x86_movcc_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{}\t%0, %0" [(set_attr "type" "alu") diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index c1c1ce9beadb..f599a5424111 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2012-04-30 Uros Bizjak + + Backport from mainline + 2012-04-27 Paolo Bonzini + + PR target/53138 + * gcc.c-torture/execute/20120427-1.c: New testcase. + 2012-04-24 Jakub Jelinek 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 index 000000000000..46ed76ae9430 --- /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; +} -- 2.47.2