public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Aldy Hernandez <aldyh@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4280] Remove follow_assert_exprs from overflow_comparison. Date: Thu, 24 Nov 2022 06:39:04 +0000 (GMT) [thread overview] Message-ID: <20221124063904.989D538493EB@sourceware.org> (raw) https://gcc.gnu.org/g:22f402963f1152988982ea1ffd98b2e823905c42 commit r13-4280-g22f402963f1152988982ea1ffd98b2e823905c42 Author: Aldy Hernandez <aldyh@redhat.com> Date: Tue Nov 22 10:40:39 2022 +0100 Remove follow_assert_exprs from overflow_comparison. gcc/ChangeLog: * tree-vrp.cc (overflow_comparison_p_1): Remove follow_assert_exprs. (overflow_comparison_p): Remove use_equiv_p. * tree-vrp.h (overflow_comparison_p): Same. * vr-values.cc (vrp_evaluate_conditional_warnv_with_ops): Remove use_equiv_p argument to overflow_comparison_p. Diff: --- gcc/tree-vrp.cc | 40 ++++------------------------------------ gcc/tree-vrp.h | 2 +- gcc/vr-values.cc | 2 +- 3 files changed, 6 insertions(+), 38 deletions(-) diff --git a/gcc/tree-vrp.cc b/gcc/tree-vrp.cc index d29941d0f2d..3846dc1d849 100644 --- a/gcc/tree-vrp.cc +++ b/gcc/tree-vrp.cc @@ -679,7 +679,7 @@ range_fold_unary_expr (value_range *vr, static bool overflow_comparison_p_1 (enum tree_code code, tree op0, tree op1, - bool follow_assert_exprs, bool reversed, tree *new_cst) + bool reversed, tree *new_cst) { /* See if this is a relational operation between two SSA_NAMES with unsigned, overflow wrapping values. If so, check it more deeply. */ @@ -693,19 +693,6 @@ overflow_comparison_p_1 (enum tree_code code, tree op0, tree op1, { gimple *op1_def = SSA_NAME_DEF_STMT (op1); - /* If requested, follow any ASSERT_EXPRs backwards for OP1. */ - if (follow_assert_exprs) - { - while (gimple_assign_single_p (op1_def) - && TREE_CODE (gimple_assign_rhs1 (op1_def)) == ASSERT_EXPR) - { - op1 = TREE_OPERAND (gimple_assign_rhs1 (op1_def), 0); - if (TREE_CODE (op1) != SSA_NAME) - break; - op1_def = SSA_NAME_DEF_STMT (op1); - } - } - /* Now look at the defining statement of OP1 to see if it adds or subtracts a nonzero constant from another operand. */ if (op1_def @@ -716,24 +703,6 @@ overflow_comparison_p_1 (enum tree_code code, tree op0, tree op1, { tree target = gimple_assign_rhs1 (op1_def); - /* If requested, follow ASSERT_EXPRs backwards for op0 looking - for one where TARGET appears on the RHS. */ - if (follow_assert_exprs) - { - /* Now see if that "other operand" is op0, following the chain - of ASSERT_EXPRs if necessary. */ - gimple *op0_def = SSA_NAME_DEF_STMT (op0); - while (op0 != target - && gimple_assign_single_p (op0_def) - && TREE_CODE (gimple_assign_rhs1 (op0_def)) == ASSERT_EXPR) - { - op0 = TREE_OPERAND (gimple_assign_rhs1 (op0_def), 0); - if (TREE_CODE (op0) != SSA_NAME) - break; - op0_def = SSA_NAME_DEF_STMT (op0); - } - } - /* If we did not find our target SSA_NAME, then this is not an overflow test. */ if (op0 != target) @@ -764,13 +733,12 @@ overflow_comparison_p_1 (enum tree_code code, tree op0, tree op1, the alternate range representation is often useful within VRP. */ bool -overflow_comparison_p (tree_code code, tree name, tree val, - bool use_equiv_p, tree *new_cst) +overflow_comparison_p (tree_code code, tree name, tree val, tree *new_cst) { - if (overflow_comparison_p_1 (code, name, val, use_equiv_p, false, new_cst)) + if (overflow_comparison_p_1 (code, name, val, false, new_cst)) return true; return overflow_comparison_p_1 (swap_tree_comparison (code), val, name, - use_equiv_p, true, new_cst); + true, new_cst); } /* Handle diff --git a/gcc/tree-vrp.h b/gcc/tree-vrp.h index 07630b5b1ca..127909604f0 100644 --- a/gcc/tree-vrp.h +++ b/gcc/tree-vrp.h @@ -39,7 +39,7 @@ extern enum value_range_kind intersect_range_with_nonzero_bits extern bool find_case_label_range (gswitch *, tree, tree, size_t *, size_t *); extern tree find_case_label_range (gswitch *, const irange *vr); extern bool find_case_label_index (gswitch *, size_t, tree, size_t *); -extern bool overflow_comparison_p (tree_code, tree, tree, bool, tree *); +extern bool overflow_comparison_p (tree_code, tree, tree, tree *); extern void maybe_set_nonzero_bits (edge, tree); #endif /* GCC_TREE_VRP_H */ diff --git a/gcc/vr-values.cc b/gcc/vr-values.cc index 5019fea4587..afb2648cfca 100644 --- a/gcc/vr-values.cc +++ b/gcc/vr-values.cc @@ -837,7 +837,7 @@ simplify_using_ranges::vrp_evaluate_conditional_warnv_with_ops occurs when the chosen argument is zero and does not occur if the chosen argument is not zero. */ tree x; - if (overflow_comparison_p (code, op0, op1, use_equiv_p, &x)) + if (overflow_comparison_p (code, op0, op1, &x)) { wide_int max = wi::max_value (TYPE_PRECISION (TREE_TYPE (op0)), UNSIGNED); /* B = A - 1; if (A < B) -> B = A - 1; if (A == 0)
reply other threads:[~2022-11-24 6:39 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221124063904.989D538493EB@sourceware.org \ --to=aldyh@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).