From: Jakub Jelinek Date: Mon, 1 Feb 2016 20:37:49 +0000 (+0100) Subject: ifcvt.c (bb_ok_for_noce_convert_multiple_sets): Return false when count is incremente... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=800cb72aae9947e6496c3705986c421978b92e8e;p=gcc.git ifcvt.c (bb_ok_for_noce_convert_multiple_sets): Return false when count is incremented above limit... * ifcvt.c (bb_ok_for_noce_convert_multiple_sets): Return false when count is incremented above limit, don't analyze further insns afterwards. From-SVN: r233050 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b3524271d58..a551069a23e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,9 @@ 2016-02-01 Jakub Jelinek + * ifcvt.c (bb_ok_for_noce_convert_multiple_sets): Return false + when count is incremented above limit, don't analyze further + insns afterwards. + * omp-low.c (oacc_parse_default_dims): Avoid -Wsign-compare warning, make sure value fits into int rather than just unsigned int. diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 53cb41f1ffa..a50e33dc66c 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -3286,15 +3286,13 @@ bb_ok_for_noce_convert_multiple_sets (basic_block test_bb, if (!can_conditionally_move_p (GET_MODE (dest))) return false; - ++count; + /* FORNOW: Our cost model is a count of the number of instructions we + would if-convert. This is suboptimal, and should be improved as part + of a wider rework of branch_cost. */ + if (++count > limit) + return false; } - /* FORNOW: Our cost model is a count of the number of instructions we - would if-convert. This is suboptimal, and should be improved as part - of a wider rework of branch_cost. */ - if (count > limit) - return false; - return count > 1; }