diff options
author | Ben Cheng <bccheng@google.com> | 2013-08-05 15:18:29 -0700 |
---|---|---|
committer | Ben Cheng <bccheng@google.com> | 2013-08-05 16:03:48 -0700 |
commit | 32fce3edda831e36ee484406c39dffbe0230f257 (patch) | |
tree | 733b1b5398304b260a4ee3d5d9b17da5038c5486 /gcc-4.8/gcc/ifcvt.c | |
parent | e85b9ca2afe8edbb9fa99c6ce2cc4e52dce18c21 (diff) | |
download | toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.tar.gz toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.tar.bz2 toolchain_gcc-32fce3edda831e36ee484406c39dffbe0230f257.zip |
[4.8] Merge GCC 4.8.1
Change-Id: Ic8a60b7563f5172440fd40788605163a0cca6e30
Diffstat (limited to 'gcc-4.8/gcc/ifcvt.c')
-rw-r--r-- | gcc-4.8/gcc/ifcvt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc-4.8/gcc/ifcvt.c b/gcc-4.8/gcc/ifcvt.c index f081ecd33..88967a6c2 100644 --- a/gcc-4.8/gcc/ifcvt.c +++ b/gcc-4.8/gcc/ifcvt.c @@ -964,6 +964,8 @@ end_ifcvt_sequence (struct noce_if_info *if_info) set_used_flags (if_info->x); set_used_flags (if_info->cond); + set_used_flags (if_info->a); + set_used_flags (if_info->b); unshare_all_rtl_in_chain (seq); end_sequence (); @@ -3473,7 +3475,7 @@ cond_exec_find_if_block (struct ce_if_block * ce_info) code processing. ??? we should fix this in the future. */ if (EDGE_COUNT (then_bb->succs) == 0) { - if (single_pred_p (else_bb)) + if (single_pred_p (else_bb) && else_bb != EXIT_BLOCK_PTR) { rtx last_insn = BB_END (then_bb); |