From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id 6197C3857377; Wed, 19 Oct 2022 08:56:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6197C3857377 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666169760; bh=hNQVYndtU9JwKe6xPSuy3Kk+0VnPV/KVH8SF2CGbLoI=; h=From:To:Subject:Date:From; b=vxRkPRGxP62DP4qU9zqskeVImMZ6YcA/0jr50TZX+YuOwyqyjM2OMOA3km4an5JpD voIMIY+fBOeWpGI5Jj/TCv68byibdFq0NXial/lbElv3h2cP2rPlqw6RPhHhcRPuoA MFCBTRUGFoCE80TZqoGdwYfH0GtWxCPT5dZiSZlk= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-3370] tree-optimization/106781 - adjust cgraph lhs removal X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/master X-Git-Oldrev: 75f7ff1f1e74ea9aecf30f6038545a51a30b4a87 X-Git-Newrev: 32ab9238d86dfa6d74d3592bec570f4f257d0413 Message-Id: <20221019085600.6197C3857377@sourceware.org> Date: Wed, 19 Oct 2022 08:56:00 +0000 (GMT) List-Id: https://gcc.gnu.org/g:32ab9238d86dfa6d74d3592bec570f4f257d0413 commit r13-3370-g32ab9238d86dfa6d74d3592bec570f4f257d0413 Author: Richard Biener Date: Wed Oct 19 09:01:56 2022 +0200 tree-optimization/106781 - adjust cgraph lhs removal The following matches up the cgraph code removing LHS of a noreturn call with what fixup_noreturn_call does which gets along without inserting a definition, fixing the ICE resulting from having no place to actually insert that new def. PR tree-optimization/106781 * cgraph.cc (cgraph_edge::redirect_call_stmt_to_callee): Copy LHS removal from fixup_noreturn_call. * gcc.dg/pr106781.c: New testcase. Diff: --- gcc/cgraph.cc | 14 ++++++-------- gcc/testsuite/gcc.dg/pr106781.c | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/gcc/cgraph.cc b/gcc/cgraph.cc index 0417b059965..5851b2ffc6c 100644 --- a/gcc/cgraph.cc +++ b/gcc/cgraph.cc @@ -1411,7 +1411,6 @@ cgraph_edge::redirect_call_stmt_to_callee (cgraph_edge *e) { tree decl = gimple_call_fndecl (e->call_stmt); gcall *new_stmt; - gimple_stmt_iterator gsi; if (e->speculative) { @@ -1572,18 +1571,17 @@ cgraph_edge::redirect_call_stmt_to_callee (cgraph_edge *e) && (VOID_TYPE_P (TREE_TYPE (gimple_call_fntype (new_stmt))) || should_remove_lhs_p (lhs))) { + gimple_call_set_lhs (new_stmt, NULL_TREE); + /* We need to fix up the SSA name to avoid checking errors. */ if (TREE_CODE (lhs) == SSA_NAME) { tree var = create_tmp_reg_fn (DECL_STRUCT_FUNCTION (e->caller->decl), TREE_TYPE (lhs), NULL); - var = get_or_create_ssa_default_def - (DECL_STRUCT_FUNCTION (e->caller->decl), var); - gimple *set_stmt = gimple_build_assign (lhs, var); - gsi = gsi_for_stmt (new_stmt); - gsi_insert_before_without_update (&gsi, set_stmt, GSI_SAME_STMT); - update_stmt_fn (DECL_STRUCT_FUNCTION (e->caller->decl), set_stmt); + SET_SSA_NAME_VAR_OR_IDENTIFIER (lhs, var); + SSA_NAME_DEF_STMT (lhs) = gimple_build_nop (); + set_ssa_default_def (DECL_STRUCT_FUNCTION (e->caller->decl), + var, lhs); } - gimple_call_set_lhs (new_stmt, NULL_TREE); update_stmt_fn (DECL_STRUCT_FUNCTION (e->caller->decl), new_stmt); } diff --git a/gcc/testsuite/gcc.dg/pr106781.c b/gcc/testsuite/gcc.dg/pr106781.c new file mode 100644 index 00000000000..339c28c41df --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr106781.c @@ -0,0 +1,18 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -Wno-div-by-zero" } */ + +int n; + +__attribute__ ((noinline, returns_twice)) static int +bar (int) +{ + n /= 0; + + return n; +} + +int +foo (int x) +{ + return bar (x); +}