From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 630EB3857838; Tue, 13 Oct 2020 13:41:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 630EB3857838 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/if-to-switch-v4)] Fix various issues. X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/if-to-switch-v4 X-Git-Oldrev: b064cbf06fa6aa4c59debe93686405058e59d3e9 X-Git-Newrev: ff35e1afaed3227a8d82c3f4077d98c328db0957 Message-Id: <20201013134127.630EB3857838@sourceware.org> Date: Tue, 13 Oct 2020 13:41:27 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Oct 2020 13:41:27 -0000 https://gcc.gnu.org/g:ff35e1afaed3227a8d82c3f4077d98c328db0957 commit ff35e1afaed3227a8d82c3f4077d98c328db0957 Author: Martin Liska Date: Tue Oct 13 15:41:18 2020 +0200 Fix various issues. Diff: --- gcc/gimple-if-to-switch.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/gimple-if-to-switch.cc b/gcc/gimple-if-to-switch.cc index ba78a2c7233..8f61ba80c10 100644 --- a/gcc/gimple-if-to-switch.cc +++ b/gcc/gimple-if-to-switch.cc @@ -89,7 +89,7 @@ condition_info::record_phi_mapping (edge e, mapping_vec *vec) gphi *phi = gsi.phi (); if (!virtual_operand_p (gimple_phi_result (phi))) { - tree arg = PHI_ARG_DEF_FROM_EDGE (phi, m_true_edge); + tree arg = PHI_ARG_DEF_FROM_EDGE (phi, e); vec->safe_push (std::make_pair (phi, arg)); } } @@ -408,8 +408,15 @@ find_conditions (basic_block bb, info.m_true_edge = in_p ? true_edge : false_edge; info.m_false_edge = in_p ? false_edge : true_edge; + for (unsigned i = 0; i < info.m_ranges.length (); ++i) + if (info.m_ranges[i].exp == NULL_TREE + || info.m_ranges[i].low == NULL_TREE + || info.m_ranges[i].high == NULL_TREE) + return; + for (unsigned i = 1; i < info.m_ranges.length (); ++i) - if (info.m_ranges[i].exp != expr || info.m_ranges[i].in_p != in_p) + if (info.m_ranges[i].exp != expr + || info.m_ranges[i].in_p != in_p) return; info.record_phi_mapping (info.m_true_edge, &info.m_true_edge_phi_mapping); @@ -495,6 +502,7 @@ pass_if_to_switch::execute (function *fun) chain->m_entries.reverse (); if (chain->m_entries.length () >= 3 + && chain->check_non_overlapping_cases () && chain->is_beneficial ()) { expanded_location loc