From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1863) id 4A2F6388880A; Thu, 17 Jun 2021 09:12:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4A2F6388880A MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Trevor Saunders To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-1555] return auto_vec from get_loop_hot_path X-Act-Checkin: gcc X-Git-Author: Trevor Saunders X-Git-Refname: refs/heads/master X-Git-Oldrev: 265af872a1f8d7ffda2c4056d1d80a3ec4fc8650 X-Git-Newrev: a165040e11e340f6b397104f23717ef398408e67 Message-Id: <20210617091201.4A2F6388880A@sourceware.org> Date: Thu, 17 Jun 2021 09:12:01 +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, 17 Jun 2021 09:12:01 -0000 https://gcc.gnu.org/g:a165040e11e340f6b397104f23717ef398408e67 commit r12-1555-ga165040e11e340f6b397104f23717ef398408e67 Author: Trevor Saunders Date: Sun Jun 6 20:13:38 2021 -0400 return auto_vec from get_loop_hot_path This ensures callers take ownership of the returned vector. Signed-off-by: Trevor Saunders gcc/ChangeLog: * cfgloop.h (get_loop_hot_path): Return auto_vec. * cfgloopanal.c (get_loop_hot_path): Likewise. * tree-ssa-loop-ivcanon.c (tree_estimate_loop_size): Likewise. Diff: --- gcc/cfgloop.h | 2 +- gcc/cfgloopanal.c | 2 +- gcc/tree-ssa-loop-ivcanon.c | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gcc/cfgloop.h b/gcc/cfgloop.h index 113241da130..5e699276c88 100644 --- a/gcc/cfgloop.h +++ b/gcc/cfgloop.h @@ -840,7 +840,7 @@ enum extern void doloop_optimize_loops (void); extern void move_loop_invariants (void); -extern vec get_loop_hot_path (const class loop *loop); +extern auto_vec get_loop_hot_path (const class loop *loop); /* Returns the outermost loop of the loop nest that contains LOOP.*/ static inline class loop * diff --git a/gcc/cfgloopanal.c b/gcc/cfgloopanal.c index 54426b54881..fdd8d3f43fe 100644 --- a/gcc/cfgloopanal.c +++ b/gcc/cfgloopanal.c @@ -500,7 +500,7 @@ single_likely_exit (class loop *loop, vec exits) order against direction of edges from latch. Specially, if header != latch, latch is the 1-st block. */ -vec +auto_vec get_loop_hot_path (const class loop *loop) { basic_block bb = loop->header; diff --git a/gcc/tree-ssa-loop-ivcanon.c b/gcc/tree-ssa-loop-ivcanon.c index 3f9e9d0869f..b1971f83544 100644 --- a/gcc/tree-ssa-loop-ivcanon.c +++ b/gcc/tree-ssa-loop-ivcanon.c @@ -218,7 +218,7 @@ tree_estimate_loop_size (class loop *loop, edge exit, edge edge_to_cancel, gimple_stmt_iterator gsi; unsigned int i; bool after_exit; - vec path = get_loop_hot_path (loop); + auto_vec path = get_loop_hot_path (loop); size->overall = 0; size->eliminated_by_peeling = 0; @@ -342,7 +342,6 @@ tree_estimate_loop_size (class loop *loop, edge exit, edge edge_to_cancel, - size->last_iteration_eliminated_by_peeling) > upper_bound) { free (body); - path.release (); return true; } } @@ -379,7 +378,7 @@ tree_estimate_loop_size (class loop *loop, edge exit, edge edge_to_cancel, size->num_branches_on_hot_path++; } } - path.release (); + if (dump_file && (dump_flags & TDF_DETAILS)) fprintf (dump_file, "size: %i-%i, last_iteration: %i-%i\n", size->overall, size->eliminated_by_peeling, size->last_iteration,