From cac5cd08b4afc23d194bc034f67bed94243c605a Mon Sep 17 00:00:00 2001 From: jakub Date: Tue, 13 Jan 2009 22:36:06 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@143355 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 7 +++++++ gcc/combine.c | 3 ++- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/gcc.dg/torture/pr38774.c | 16 ++++++++++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr38774.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 76899dff08f..78c91fc1097 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2009-01-13 Jakub Jelinek + + 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 * doc/invoke.texi (ARM Options): Update lists of -mcpu and -march diff --git a/gcc/combine.c b/gcc/combine.c index 82bf9f5e115..3aca075aae1 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 18f15ca65ab..ecec2ac1c0c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2009-01-13 Jakub Jelinek + 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 00000000000..d6d7fcb0ff5 --- /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; +} -- 2.11.0