aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2011-11-06 20:43:32 +0100
committerJakub Jelinek <jakub@gcc.gnu.org>2011-11-06 20:43:32 +0100
commit4a7ab00c251229d1c1ebbc21844843e9e23e7618 (patch)
tree403d34b060ca54ec4a23f99408f8fcffb6d8cf73
parent5e490f2a35ed25afc325d0162b7579f2536577e7 (diff)
downloadgcc-4a7ab00c251229d1c1ebbc21844843e9e23e7618.zip
gcc-4a7ab00c251229d1c1ebbc21844843e9e23e7618.tar.gz
gcc-4a7ab00c251229d1c1ebbc21844843e9e23e7618.tar.bz2
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
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/tree-cfg.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a03361..728edbd 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 28aea2f..7ec50db 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;
}