From 353e3a5465e4e876713517c7e2d13ea8443ee97f Mon Sep 17 00:00:00 2001 From: Aldy Hernandez Date: Fri, 17 Apr 2020 18:25:23 +0200 Subject: Merge compute_operand_range_op and compute_operand_range into the latter. --- gcc/gimple-range-gori.cc | 34 ++++++++++------------------------ gcc/gimple-range-gori.h | 3 --- 2 files changed, 10 insertions(+), 27 deletions(-) (limited to 'gcc') diff --git a/gcc/gimple-range-gori.cc b/gcc/gimple-range-gori.cc index a591ba7..98618b7 100644 --- a/gcc/gimple-range-gori.cc +++ b/gcc/gimple-range-gori.cc @@ -636,26 +636,6 @@ gori_compute::~gori_compute () { } -// Return an evaluation for NAME as it would appear in STMT when the -// statement's lhs evaluates to LHS. If successful, return TRUE and -// store the evaluation in R, otherwise return FALSE. -// -// If present, NAME_RANGE is any known range for NAME coming into STMT. - -bool -gori_compute::compute_operand_range (irange &r, gimple *stmt, - const irange &lhs, - tree name, - const irange *name_range) -{ - if (gimple_range_handler (stmt)) - return compute_operand_range_op (r, stmt, lhs, name, name_range); - if (is_a (stmt)) - return compute_operand_range_switch (r, as_a (stmt), lhs, - name, name_range); - return false; -} - // Given the switch S, return an evaluation in R for NAME when the lhs // evaluates to LHS. Returning false means the name being looked for // was not resolvable. If present, NAME_RANGE is any known range for @@ -738,11 +718,17 @@ gori_compute::logical_operation_is_linear (const gimple *stmt, // If present, NAME_RANGE is any known range for NAME coming into STMT. bool -gori_compute::compute_operand_range_op (irange &r, gimple *stmt, - const irange &lhs, - tree name, - const irange *name_range) +gori_compute::compute_operand_range (irange &r, gimple *stmt, + const irange &lhs, + tree name, + const irange *name_range) { + if (is_a (stmt)) + return compute_operand_range_switch (r, as_a (stmt), lhs, + name, name_range); + if (!gimple_range_handler (stmt)) + return false; + tree op1, op2; bool op1_in_chain, op2_in_chain; diff --git a/gcc/gimple-range-gori.h b/gcc/gimple-range-gori.h index 4ec15aa..5f34a0d 100644 --- a/gcc/gimple-range-gori.h +++ b/gcc/gimple-range-gori.h @@ -179,9 +179,6 @@ private: bool compute_name_range_op (irange &r, gimple *stmt, const irange &lhs, tree name, const irange *name_range); - bool compute_operand_range_op (irange &r, gimple *stmt, - const irange &lhs, - tree name, const irange *name_range); bool compute_operand1_range (irange &r, gimple *stmt, const irange &lhs, tree name, const irange *name_range); -- cgit v1.1