From f4eafec9bc30855c45cfe86a0b04b88719516e76 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Mon, 16 Jul 2018 17:11:57 +0200 Subject: [PATCH] re PR middle-end/86511 (Traps are generated for non-trapping compares) PR target/86511 * expmed.c (emit_store_flag): Do not emit setcc followed by a conditional move when trapping comparison was split to a non-trapping one (and vice versa). From-SVN: r262736 --- gcc/ChangeLog | 16 ++++++++++++---- gcc/expmed.c | 5 +++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 56e1ec3..b4a8151 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-07-16 Uros Bizjak + + PR target/86511 + * expmed.c (emit_store_flag): Do not emit setcc followed by a + conditional move when trapping comparison was split to a + non-trapping one (and vice versa). + 2018-07-16 Ilya Leoshkevich * config/s390/s390.c (s390_function_profiler): Generate nops @@ -126,11 +133,12 @@ when result_eq is false. (expand_builtin_strcmp): Inline the calls first. (expand_builtin_strncmp): Likewise. - (inline_string_cmp): New routine. Expand a string compare + (inline_string_cmp): New routine. Expand a string compare call by using a sequence of char comparison. (inline_expand_builtin_string_cmp): New routine. Inline expansion a call to str(n)cmp/memcmp. - * doc/invoke.texi (--param builtin-string-cmp-inline-length): New option. + * doc/invoke.texi (--param builtin-string-cmp-inline-length): + New option. * params.def (BUILTIN_STRING_CMP_INLINE_LENGTH): New. 2018-07-13 Richard Earnshaw @@ -724,9 +732,9 @@ * config.gcc (riscv*-*-*): When setting xlen, handle riscv-*. -2018-07-05 Indu Bhagat +2018-07-05 Indu Bhagat - * config/aarch64/aarch64-simd.md: correct flags text for + * config/aarch64/aarch64-simd.md: correct flags text for MIN_EXPR replacement. 2018-07-05 James Clarke diff --git a/gcc/expmed.c b/gcc/expmed.c index b01e194..f114eb4 100644 --- a/gcc/expmed.c +++ b/gcc/expmed.c @@ -6038,6 +6038,11 @@ emit_store_flag (rtx target, enum rtx_code code, rtx op0, rtx op1, if (!HAVE_conditional_move) return 0; + /* Do not turn a trapping comparison into a non-trapping one. */ + if ((code != EQ && code != NE && code != UNEQ && code != LTGT) + && flag_trapping_math) + return 0; + /* Try using a setcc instruction for ORDERED/UNORDERED, followed by a conditional move. */ tem = emit_store_flag_1 (subtarget, first_code, op0, op1, mode, 0, -- 2.7.4