diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2009-05-12 09:43:48 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gcc.gnu.org> | 2009-05-12 09:43:48 +0000 |
| commit | f90b7a5a7913cc7239cce42f6ca328b9a741b387 (patch) | |
| tree | 06c940a96a184a178bfadd53e04213225655a68d /gcc/ifcvt.c | |
| parent | b7a0af68063c79655c561750e9863799bf846cae (diff) | |
| download | gcc-f90b7a5a7913cc7239cce42f6ca328b9a741b387.zip gcc-f90b7a5a7913cc7239cce42f6ca328b9a741b387.tar.gz gcc-f90b7a5a7913cc7239cce42f6ca328b9a741b387.tar.bz2 | |
Merge cond-optab branch.
From-SVN: r147425
Diffstat (limited to 'gcc/ifcvt.c')
| -rw-r--r-- | gcc/ifcvt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index fc3cbd6..a4324a5 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -62,9 +62,6 @@ #ifndef HAVE_trap #define HAVE_trap 0 #endif -#ifndef HAVE_conditional_trap -#define HAVE_conditional_trap 0 -#endif #ifndef MAX_CONDITIONAL_EXECUTE #define MAX_CONDITIONAL_EXECUTE \ @@ -3043,7 +3040,8 @@ find_if_header (basic_block test_bb, int pass) && cond_exec_find_if_block (&ce_info)) goto success; - if (HAVE_trap && HAVE_conditional_trap + if (HAVE_trap + && optab_handler (ctrap_optab, word_mode)->insn_code != CODE_FOR_nothing && find_cond_trap (test_bb, then_edge, else_edge)) goto success; |