From b8ef86ef26fd6c95a445397bfc1052d22647bed0 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 4 May 2011 11:21:09 +0200 Subject: [PATCH] backport: re PR target/48774 (gcc-4.6.0 optimization regression on x86_64-unknown-linux-gnu) Backported from mainline 2011-05-03 Uros Bizjak Jakub Jelinek PR target/48774 * config/i386/i386.c (ix86_match_ccmode): For CC{A,C,O,S}mode only succeed if req_mode is the same as set_mode. * gcc.dg/pr48774.c: New test. From-SVN: r173359 --- gcc/ChangeLog | 9 +++++++- gcc/config/i386/i386.c | 6 +++++- gcc/testsuite/ChangeLog | 7 ++++++- gcc/testsuite/gcc.dg/pr48774.c | 38 ++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr48774.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0e23ca92248f..5f495e88382d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,13 @@ 2011-05-04 Jakub Jelinek - Backport from mainline + Backported from mainline + 2011-05-03 Uros Bizjak + Jakub Jelinek + + PR target/48774 + * config/i386/i386.c (ix86_match_ccmode): For CC{A,C,O,S}mode + only succeed if req_mode is the same as set_mode. + 2011-04-30 Jakub Jelinek PR tree-optimization/48809 diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index f0ab2968e23e..101374934a30 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -13645,11 +13645,15 @@ ix86_match_ccmode (rtx insn, enum machine_mode req_mode) if (req_mode == CCZmode) return 0; /* FALLTHRU */ + case CCZmode: + break; + case CCAmode: case CCCmode: case CCOmode: case CCSmode: - case CCZmode: + if (set_mode != req_mode) + return 0; break; default: diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2929a2a3f262..2e8dd6bf269d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2011-05-04 Jakub Jelinek - Backport from mainline + Backported from mainline + 2011-05-03 Jakub Jelinek + + PR target/48774 + * gcc.dg/pr48774.c: New test. + 2011-04-30 Jakub Jelinek PR tree-optimization/48809 diff --git a/gcc/testsuite/gcc.dg/pr48774.c b/gcc/testsuite/gcc.dg/pr48774.c new file mode 100644 index 000000000000..5b1c2c8162e2 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr48774.c @@ -0,0 +1,38 @@ +/* PR target/48774 */ +/* { dg-do run } */ +/* { dg-options "-O2 -funroll-loops" } */ + +extern void abort (void); +unsigned long int s[24] + = { 12, ~1, 12, ~2, 12, ~4, 12, ~8, 12, ~16, 12, ~32, + 12, ~64, 12, ~128, 12, ~256, 12, ~512, 12, ~1024, 12, ~2048 }; +struct { int n; unsigned long *e[12]; } g + = { 12, { &s[0], &s[2], &s[4], &s[6], &s[8], &s[10], &s[12], &s[14], + &s[16], &s[18], &s[20], &s[22] } }; +int c[12]; + +__attribute__((noinline)) void +foo (void) +{ + int i, j; + for (i = 0; i < g.n; i++) + for (j = 0; j < g.n; j++) + { + if (i == j && j < g.e[0][0] && (g.e[i][1] & (1UL << j))) + abort (); + if (j < g.e[0][0] && (g.e[i][1] & (1UL << j))) + c[i]++; + } +} + +int +main () +{ + int i; + asm volatile ("" : "+m" (s), "+m" (g), "+m" (c)); + foo (); + for (i = 0; i < 12; i++) + if (c[i] != 11) + abort (); + return 0; +} -- 2.47.2