From fb4b60c68edf7196770fdc65b3862662bc2d647b Mon Sep 17 00:00:00 2001 From: Vladislav Ivanishin Date: Wed, 15 May 2019 12:40:04 +0000 Subject: [PATCH] tree-ssa-uninit: clean up is_value_included_in 2019-05-15 Vladislav Ivanishin * tree-ssa-uninit.c (is_value_included_in): Remove is_unsigned and merge semantically equivalent branches (left over after prior refactorings). From-SVN: r271207 --- gcc/ChangeLog | 5 +++++ gcc/tree-ssa-uninit.c | 31 ++++++------------------------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b531a2950ef..fe85101e435 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-05-15 Vladislav Ivanishin + + * tree-ssa-uninit.c (is_value_included_in): Remove is_unsigned and merge + semantically equivalent branches (left over after prior refactorings). + 2019-05-15 Richard Biener PR tree-optimization/88828 diff --git a/gcc/tree-ssa-uninit.c b/gcc/tree-ssa-uninit.c index 831587854c6..7362e374dea 100644 --- a/gcc/tree-ssa-uninit.c +++ b/gcc/tree-ssa-uninit.c @@ -1017,45 +1017,26 @@ static bool is_value_included_in (tree val, tree boundary, enum tree_code cmpc) { bool inverted = false; - bool is_unsigned; bool result; /* Only handle integer constant here. */ if (TREE_CODE (val) != INTEGER_CST || TREE_CODE (boundary) != INTEGER_CST) return true; - is_unsigned = TYPE_UNSIGNED (TREE_TYPE (val)); - if (cmpc == GE_EXPR || cmpc == GT_EXPR || cmpc == NE_EXPR) { cmpc = invert_tree_comparison (cmpc, false); inverted = true; } - if (is_unsigned) - { - if (cmpc == EQ_EXPR) - result = tree_int_cst_equal (val, boundary); - else if (cmpc == LT_EXPR) - result = tree_int_cst_lt (val, boundary); - else - { - gcc_assert (cmpc == LE_EXPR); - result = tree_int_cst_le (val, boundary); - } - } + if (cmpc == EQ_EXPR) + result = tree_int_cst_equal (val, boundary); + else if (cmpc == LT_EXPR) + result = tree_int_cst_lt (val, boundary); else { - if (cmpc == EQ_EXPR) - result = tree_int_cst_equal (val, boundary); - else if (cmpc == LT_EXPR) - result = tree_int_cst_lt (val, boundary); - else - { - gcc_assert (cmpc == LE_EXPR); - result = (tree_int_cst_equal (val, boundary) - || tree_int_cst_lt (val, boundary)); - } + gcc_assert (cmpc == LE_EXPR); + result = tree_int_cst_le (val, boundary); } if (inverted) -- 2.30.2