From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2140) id 47E2D3858288; Thu, 19 Oct 2023 06:01:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 47E2D3858288 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1697695270; bh=aglASgQCt1YEwa036RkYwo6bYg0cLgiUOTiQCwQZpV4=; h=From:To:Subject:Date:From; b=EFvCsgtVBJnuE8WfpLR9p9RCpNm8trS17W7RroVYIoACRu7k3EafvLcJoeBzKDP4R /SI4AOvidw352Jm1BMY/nrPrE5EFibC3OonM0EZLkMM6nxsuWTfTKdncH2IZzMJaCZ DvrkLbOKs2V3N7xEy/aabDBvyzotxl0XO+BhZdq4= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Alexandre Oliva To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/aoliva/heads/testme)] return edge in make_eh_edges X-Act-Checkin: gcc X-Git-Author: Alexandre Oliva X-Git-Refname: refs/users/aoliva/heads/testme X-Git-Oldrev: c66b85091629b553b1c8b432020180341536be6b X-Git-Newrev: 1428a8d4552ac7b28c87eee1b84b90ef13743cc0 Message-Id: <20231019060110.47E2D3858288@sourceware.org> Date: Thu, 19 Oct 2023 06:01:10 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1428a8d4552ac7b28c87eee1b84b90ef13743cc0 commit 1428a8d4552ac7b28c87eee1b84b90ef13743cc0 Author: Alexandre Oliva Date: Thu Oct 19 02:52:24 2023 -0300 return edge in make_eh_edges The need to initialize edge probabilities has made make_eh_edges undesirably hard to use. I suppose we don't want make_eh_edges to initialize the probability of the newly-added edge itself, so that the caller takes care of it, but identifying the added edge in need of adjustments is inefficient and cumbersome. Change make_eh_edges so that it returns the added edge. for gcc/ChangeLog * tree-eh.cc (make_eh_edges): Return the new edge. Diff: --- gcc/tree-eh.cc | 6 +++--- gcc/tree-eh.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/tree-eh.cc b/gcc/tree-eh.cc index e8ceff36cc6e..1cb8e0865290 100644 --- a/gcc/tree-eh.cc +++ b/gcc/tree-eh.cc @@ -2274,7 +2274,7 @@ make_eh_dispatch_edges (geh_dispatch *stmt) /* Create the single EH edge from STMT to its nearest landing pad, if there is such a landing pad within the current function. */ -void +edge make_eh_edges (gimple *stmt) { basic_block src, dst; @@ -2283,14 +2283,14 @@ make_eh_edges (gimple *stmt) lp_nr = lookup_stmt_eh_lp (stmt); if (lp_nr <= 0) - return; + return NULL; lp = get_eh_landing_pad_from_number (lp_nr); gcc_assert (lp != NULL); src = gimple_bb (stmt); dst = label_to_block (cfun, lp->post_landing_pad); - make_edge (src, dst, EDGE_EH); + return make_edge (src, dst, EDGE_EH); } /* Do the work in redirecting EDGE_IN to NEW_BB within the EH region tree; diff --git a/gcc/tree-eh.h b/gcc/tree-eh.h index 771be50fe9a1..1382568b7c91 100644 --- a/gcc/tree-eh.h +++ b/gcc/tree-eh.h @@ -30,7 +30,7 @@ extern bool remove_stmt_from_eh_lp (gimple *); extern int lookup_stmt_eh_lp_fn (struct function *, const gimple *); extern int lookup_stmt_eh_lp (const gimple *); extern bool make_eh_dispatch_edges (geh_dispatch *); -extern void make_eh_edges (gimple *); +extern edge make_eh_edges (gimple *); extern edge redirect_eh_edge (edge, basic_block); extern void redirect_eh_dispatch_edge (geh_dispatch *, edge, basic_block); extern bool operation_could_trap_helper_p (enum tree_code, bool, bool, bool,