diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2009-01-13 23:36:06 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2009-01-13 23:36:06 +0100 |
| commit | d3302fd3185bb03a499e9698d1995ade81ee0321 (patch) | |
| tree | 4718c31eaf240b0488be6f53ac949577827b42bc /gcc | |
| parent | 7ab23fd0b97eff95faf1f48828784f4025ceca59 (diff) | |
| download | gcc-d3302fd3185bb03a499e9698d1995ade81ee0321.zip gcc-d3302fd3185bb03a499e9698d1995ade81ee0321.tar.gz gcc-d3302fd3185bb03a499e9698d1995ade81ee0321.tar.bz2 | |
re PR rtl-optimization/38774 (ice in df_refs_verify, at df-scan.c:4307)
PR rtl-optimization/38774
* combine.c (simplify_set): When undoing cc_use change, don't do
PUT_CODE on the newly created comparison, but instead put back the
old comparison.
* gcc.dg/torture/pr38774.c: New test.
From-SVN: r143355
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/combine.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/torture/pr38774.c | 16 |
4 files changed, 28 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 76899df..78c91fc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2009-01-13 Jakub Jelinek <jakub@redhat.com> + + PR rtl-optimization/38774 + * combine.c (simplify_set): When undoing cc_use change, don't do + PUT_CODE on the newly created comparison, but instead put back the + old comparison. + 2009-01-13 Joseph Myers <joseph@codesourcery.com> * doc/invoke.texi (ARM Options): Update lists of -mcpu and -march diff --git a/gcc/combine.c b/gcc/combine.c index 82bf9f5..3aca075 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -5706,6 +5706,7 @@ simplify_set (rtx x) { int other_changed_previously = other_changed; unsigned HOST_WIDE_INT mask; + rtx old_cc_use = *cc_use; SUBST (*cc_use, gen_rtx_fmt_ee (new_code, GET_MODE (*cc_use), dest, const0_rtx)); @@ -5728,7 +5729,7 @@ simplify_set (rtx x) if ((recog_for_combine (&pat, other_insn, ¬e) < 0 && ! check_asm_operands (pat))) { - PUT_CODE (*cc_use, old_code); + *cc_use = old_cc_use; other_changed = 0; op0 = simplify_gen_binary (XOR, GET_MODE (op0), diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 18f15ca..ecec2ac 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2009-01-13 Jakub Jelinek <jakub@redhat.com> + PR rtl-optimization/38774 + * gcc.dg/torture/pr38774.c: New test. + PR c++/38795 * g++.dg/cpp0x/pr38795.C: New test. diff --git a/gcc/testsuite/gcc.dg/torture/pr38774.c b/gcc/testsuite/gcc.dg/torture/pr38774.c new file mode 100644 index 0000000..d6d7fcb --- /dev/null +++ b/gcc/testsuite/gcc.dg/torture/pr38774.c @@ -0,0 +1,16 @@ +/* PR rtl-optimization/38774 */ +/* { dg-do compile } */ +/* { dg-options "" } */ +/* { dg-options "-march=i686" { target { { i?86-*-* x86_64-*-* } && ilp32 } } } */ + +extern int bar (void); +volatile int g; + +int +foo (void) +{ + int a = 1 >= bar (); + if ((1 > 9223372036854775807LL - a && 1 - a ? : 1 + a) & 1) + return g; + return 0; +} |