diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2007-08-26 18:24:19 +0000 |
|---|---|---|
| committer | H.J. Lu <hjl@gcc.gnu.org> | 2007-08-26 11:24:19 -0700 |
| commit | 6d46783956d60c60f81191373194a2949faaf0af (patch) | |
| tree | e608cbb4dca3385e3627ee2e91f2ecdf14351056 | |
| parent | 75be5dc0a1ae68106d1a047d0c0c8fada4bfec8c (diff) | |
| download | gcc-6d46783956d60c60f81191373194a2949faaf0af.zip gcc-6d46783956d60c60f81191373194a2949faaf0af.tar.gz gcc-6d46783956d60c60f81191373194a2949faaf0af.tar.bz2 | |
re PR middle-end/33181 (Revision 127766 generates bad cmov)
gcc/
2007-08-26 H.J. Lu <hongjiu.lu@intel.com>
PR middle-end/33181
* ifcvt.c (noce_get_alt_condition): Make sure that the previous
non NOTE insn doesn't cross basic block.
(noce_try_abs): Likewise.
(noce_process_if_block): Likewise.
gcc/testsuite/
2007-08-26 H.J. Lu <hongjiu.lu@intel.com>
PR middle-end/33181
* gcc.dg/ifelse-2.c: New.
From-SVN: r127810
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ifcvt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/ifelse-2.c | 34 |
4 files changed, 50 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1b834ba..0c659f5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2007-08-26 H.J. Lu <hongjiu.lu@intel.com> + + PR middle-end/33181 + * ifcvt.c (noce_get_alt_condition): Make sure that the previous + non NOTE insn doesn't cross basic block. + (noce_try_abs): Likewise. + (noce_process_if_block): Likewise. + 2007-08-26 David Edelsohn <edelsohn@gnu.org> PR target/33151 diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index b3cdf3a..644a5e1 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -1534,6 +1534,7 @@ noce_get_alt_condition (struct noce_if_info *if_info, rtx target, /* First, look to see if we put a constant in a register. */ prev_insn = prev_nonnote_insn (if_info->cond_earliest); if (prev_insn + && BLOCK_NUM (prev_insn) == BLOCK_NUM (if_info->cond_earliest) && INSN_P (prev_insn) && GET_CODE (PATTERN (prev_insn)) == SET) { @@ -1772,6 +1773,7 @@ noce_try_abs (struct noce_if_info *if_info) { rtx set, insn = prev_nonnote_insn (earliest); if (insn + && BLOCK_NUM (insn) == BLOCK_NUM (earliest) && (set = single_set (insn)) && rtx_equal_p (SET_DEST (set), c)) { @@ -2198,6 +2200,7 @@ noce_process_if_block (struct noce_if_info *if_info) COND_EARLIEST to JUMP. Make sure the relevant data is still intact. */ if (! insn_b + || BLOCK_NUM (insn_b) != BLOCK_NUM (if_info->cond_earliest) || !NONJUMP_INSN_P (insn_b) || (set_b = single_set (insn_b)) == NULL_RTX || ! rtx_equal_p (x, SET_DEST (set_b)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8dbd4c2..ae2f57b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-08-26 H.J. Lu <hongjiu.lu@intel.com> + + PR middle-end/33181 + * gcc.dg/ifelse-2.c: New. + 2007-08-26 Tobias Burnus <burnus@net-b.de> PR fortran/32980 diff --git a/gcc/testsuite/gcc.dg/ifelse-2.c b/gcc/testsuite/gcc.dg/ifelse-2.c new file mode 100644 index 0000000..0210fcf --- /dev/null +++ b/gcc/testsuite/gcc.dg/ifelse-2.c @@ -0,0 +1,34 @@ +/* +{ dg-do run } +{ dg-options "-O2" } +*/ + +extern void abort (void); + +enum Status +{ + P_ON_LOWER = -4, + P_ON_UPPER = -2, + P_FREE = -1 +}; + +void +foo (enum Status *stat, double newUpper, double lower, double max) +{ + if (newUpper >= max) + *stat = P_FREE; + else if (newUpper == lower) + *stat = P_ON_LOWER; +} + +int +main () +{ + enum Status stat = P_ON_UPPER; + + foo (&stat, 5.0, -10.0, 10.0); + + if (stat != P_ON_UPPER) + abort (); + return 0; +} |