From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1611) id 9B72F3858C60; Thu, 7 Oct 2021 14:22:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9B72F3858C60 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Jambor To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-4230] ipa: Fix ICE when speculating calls from inlined functions (PR 102388) X-Act-Checkin: gcc X-Git-Author: Martin Jambor X-Git-Refname: refs/heads/master X-Git-Oldrev: 2e6e0d86a06389056d0e7fecc99c547420ad787a X-Git-Newrev: 1a7d452c092be42a892d00c19561af10f42410b0 Message-Id: <20211007142219.9B72F3858C60@sourceware.org> Date: Thu, 7 Oct 2021 14:22:19 +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: Thu, 07 Oct 2021 14:22:19 -0000 https://gcc.gnu.org/g:1a7d452c092be42a892d00c19561af10f42410b0 commit r12-4230-g1a7d452c092be42a892d00c19561af10f42410b0 Author: Martin Jambor Date: Thu Oct 7 16:21:19 2021 +0200 ipa: Fix ICE when speculating calls from inlined functions (PR 102388) The code handling various cases which lead to call graph edge duplication (in order to update reference descriptions used to track and remove no-longer needed references) has missed one important case. When edge duplication is an effect of creating a speculative edge for an indirect edge which carries a constant jump function which had been created from a pass-through function when the edge caller has was inlined into one of its callers, the reference description attached to the function describes an edge higher up in the "inlined" clone tree and so even the new speculative edge will. Therefore we should not try to duplicate the reference description itself but rather just bump the refcount of the existing one. gcc/ChangeLog: 2021-09-22 Martin Jambor PR ipa/102388 * ipa-prop.c (ipa_edge_args_sum_t::duplicate): Also handle the case when the source reference description corresponds to a referance taken in a function src->caller is inlined to. Diff: --- gcc/ipa-prop.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/gcc/ipa-prop.c b/gcc/ipa-prop.c index 1c69d9766c5..443f21ce61b 100644 --- a/gcc/ipa-prop.c +++ b/gcc/ipa-prop.c @@ -4428,19 +4428,33 @@ ipa_edge_args_sum_t::duplicate (cgraph_edge *src, cgraph_edge *dst, dst_jf->value.constant.rdesc = NULL; else if (src->caller == dst->caller) { - struct ipa_ref *ref; - symtab_node *n = symtab_node_for_jfunc (src_jf); - gcc_checking_assert (n); - ref = src->caller->find_reference (n, src->call_stmt, - src->lto_stmt_uid); - gcc_checking_assert (ref); - dst->caller->clone_reference (ref, ref->stmt); - - struct ipa_cst_ref_desc *dst_rdesc = ipa_refdesc_pool.allocate (); - dst_rdesc->cs = dst; - dst_rdesc->refcount = src_rdesc->refcount; - dst_rdesc->next_duplicate = NULL; - dst_jf->value.constant.rdesc = dst_rdesc; + /* Creation of a speculative edge. If the source edge is the one + grabbing a reference, we must create a new (duplicate) + reference description. Otherwise they refer to the same + description corresponding to a reference taken in a function + src->caller is inlined to. In that case we just must + increment the refcount. */ + if (src_rdesc->cs == src) + { + symtab_node *n = symtab_node_for_jfunc (src_jf); + gcc_checking_assert (n); + ipa_ref *ref + = src->caller->find_reference (n, src->call_stmt, + src->lto_stmt_uid); + gcc_checking_assert (ref); + dst->caller->clone_reference (ref, ref->stmt); + + ipa_cst_ref_desc *dst_rdesc = ipa_refdesc_pool.allocate (); + dst_rdesc->cs = dst; + dst_rdesc->refcount = src_rdesc->refcount; + dst_rdesc->next_duplicate = NULL; + dst_jf->value.constant.rdesc = dst_rdesc; + } + else + { + src_rdesc->refcount++; + dst_jf->value.constant.rdesc = src_rdesc; + } } else if (src_rdesc->cs == src) {