From: Jakub Jelinek <jakub@redhat.com>
Date: Sun, 6 Nov 2011 19:43:32 +0000 (+0100)
Subject: tree-cfg.c (gimple_can_merge_blocks_p): For -O0 don't remove any user labels.
X-Git-Tag: releases/gcc-4.7.0~2441
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a7ab00c251229d1c1ebbc21844843e9e23e7618;p=thirdparty%2Fgcc.git

tree-cfg.c (gimple_can_merge_blocks_p): For -O0 don't remove any user labels.

	* tree-cfg.c (gimple_can_merge_blocks_p): For -O0 don't remove
	any user labels.

From-SVN: r181040
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a033618e479..728edbdd4320 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-06  Jakub Jelinek  <jakub@redhat.com>
+
+	* tree-cfg.c (gimple_can_merge_blocks_p): For -O0 don't remove
+	any user labels.
+
 2011-11-06  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 
 	* config/pa/pa.c (pa_hpux_init_libfuncs): Rename to pa_init_libfuncs.
diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 28aea2f69332..7ec50dbabd4f 100644
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1454,8 +1454,8 @@ gimple_can_merge_blocks_p (basic_block a, basic_block b)
 	break;
       lab = gimple_label_label (stmt);
 
-      /* Do not remove user forced labels.  */
-      if (!DECL_ARTIFICIAL (lab) && FORCED_LABEL (lab))
+      /* Do not remove user forced labels or for -O0 any user labels.  */
+      if (!DECL_ARTIFICIAL (lab) && (!optimize || FORCED_LABEL (lab)))
 	return false;
     }