From 4119cd693d27e9dd87c547de75283edd45bf6dce Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 20 Mar 2020 09:33:38 +0100 Subject: store-merging: Fix up -fnon-call-exceptions handling [PR94224] When we are adding a single store into a store group, we are already checking that store->lp_nr matches, but we have also code to add further INTEGER_CST stores into the group right away if the ordering requires that either we put there all or none from a certain set of stores. And in those cases we weren't doing these lp_nr checks, which means we could end up with stores with different lp_nr in the same group, which then ICEs during output_merged_store. 2020-03-20 Jakub Jelinek PR tree-optimization/94224 * gimple-ssa-store-merging.c (imm_store_chain_info::coalesce_immediate): Don't consider overlapping or adjacent INTEGER_CST rhs_code stores as mergeable if they have different lp_nr. * g++.dg/tree-ssa/pr94224.C: New test. --- gcc/gimple-ssa-store-merging.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gcc/gimple-ssa-store-merging.c') diff --git a/gcc/gimple-ssa-store-merging.c b/gcc/gimple-ssa-store-merging.c index 4d4f549..83ae6c4 100644 --- a/gcc/gimple-ssa-store-merging.c +++ b/gcc/gimple-ssa-store-merging.c @@ -2773,7 +2773,8 @@ imm_store_chain_info::coalesce_immediate_stores () break; if (info2->order < try_order) { - if (info2->rhs_code != INTEGER_CST) + if (info2->rhs_code != INTEGER_CST + || info2->lp_nr != merged_store->lp_nr) { /* Normally check_no_overlap makes sure this doesn't happen, but if end grows below, @@ -2791,6 +2792,7 @@ imm_store_chain_info::coalesce_immediate_stores () info2->bitpos + info2->bitsize); } else if (info2->rhs_code == INTEGER_CST + && info2->lp_nr == merged_store->lp_nr && !last_iter) { max_order = MAX (max_order, info2->order + 1); -- cgit v1.1