public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Richard Biener <rguenth@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r14-81] Remove odd code from gimple_can_merge_blocks_p
Date: Wed, 19 Apr 2023 13:41:14 +0000 (GMT)	[thread overview]
Message-ID: <20230419134114.53FC03858002@sourceware.org> (raw)

https://gcc.gnu.org/g:1da16c1141ebf3948de69eaeb1148778bf0790a9

commit r14-81-g1da16c1141ebf3948de69eaeb1148778bf0790a9
Author: Richard Biener <rguenther@suse.de>
Date:   Wed Mar 22 14:13:02 2023 +0100

    Remove odd code from gimple_can_merge_blocks_p
    
    The following removes a special case to not merge a block with
    only a non-local label.  We have a restriction of non-local labels
    to be the first statement (and label) in a block, but otherwise nothing,
    if the last stmt of A is a non-local label then it will be still
    the first statement of the combined A + B.  In particular we'd
    happily merge when there's a stmt after that label.
    
    The check originates from the tree-ssa merge.
    
    Bootstrapped and tested on x86_64-unknown-linux-gnu with all
    languages.
    
            * tree-cfg.cc (gimple_can_merge_blocks_p): Remove condition
            rejecting the merge when A contains only a non-local label.

Diff:
---
 gcc/tree-cfg.cc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/gcc/tree-cfg.cc b/gcc/tree-cfg.cc
index a9fcc7fd050..ae53e15158a 100644
--- a/gcc/tree-cfg.cc
+++ b/gcc/tree-cfg.cc
@@ -1960,12 +1960,6 @@ gimple_can_merge_blocks_p (basic_block a, basic_block b)
   if (stmt && stmt_ends_bb_p (stmt))
     return false;
 
-  /* Do not allow a block with only a non-local label to be merged.  */
-  if (stmt)
-    if (glabel *label_stmt = dyn_cast <glabel *> (stmt))
-      if (DECL_NONLOCAL (gimple_label_label (label_stmt)))
-	return false;
-
   /* Examine the labels at the beginning of B.  */
   for (gimple_stmt_iterator gsi = gsi_start_bb (b); !gsi_end_p (gsi);
        gsi_next (&gsi))

                 reply	other threads:[~2023-04-19 13:41 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230419134114.53FC03858002@sourceware.org \
    --to=rguenth@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).