diff options
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 4 |
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; } |