diff options
| author | Richard Biener <rguenther@suse.de> | 2019-06-07 12:14:55 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2019-06-07 12:14:55 +0000 |
| commit | e733243a3693142bd9c9486451c38d2dc20270ac (patch) | |
| tree | 641a164df2c05ca90667f647528cb4ba412eee57 | |
| parent | 510c9192493b6af5c4c70b14390fe340bca8ecaa (diff) | |
| download | gcc-e733243a3693142bd9c9486451c38d2dc20270ac.zip gcc-e733243a3693142bd9c9486451c38d2dc20270ac.tar.gz gcc-e733243a3693142bd9c9486451c38d2dc20270ac.tar.bz2 | |
re PR debug/90574 ([gdb] gdb wrongly stopped at a breakpoint in an unexecuted line of code)
2019-06-07 Richard Biener <rguenther@suse.de>
PR debug/90574
* tree-cfg.c (stmt_starts_bb_p): Split blocks at labels
that appear after user labels.
* gcc.misc-tests/gcov-pr90574-1.c: New testcase.
* gcc.misc-tests/gcov-pr90574-2.c: Likewise.
From-SVN: r272040
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.misc-tests/gcov-pr90574-1.c | 20 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.misc-tests/gcov-pr90574-2.c | 15 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 6 |
5 files changed, 50 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a1cffe1..41e364b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-06-07 Richard Biener <rguenther@suse.de> + + PR debug/90574 + * tree-cfg.c (stmt_starts_bb_p): Split blocks at labels + that appear after user labels. + 2019-06-07 Martin Liska <mliska@suse.cz> * cselib.c (cselib_init): Disable hash table diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9410686..75ff9da 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-06-07 Richard Biener <rguenther@suse.de> + + PR debug/90574 + * gcc.misc-tests/gcov-pr90574-1.c: New testcase. + * gcc.misc-tests/gcov-pr90574-2.c: Likewise. + 2019-06-07 Jan Hubicka <hubicka@ucw.cz> * gcc.dg/lto/alias-access-path-2.0.c: New testcase. diff --git a/gcc/testsuite/gcc.misc-tests/gcov-pr90574-1.c b/gcc/testsuite/gcc.misc-tests/gcov-pr90574-1.c new file mode 100644 index 0000000..41ac9bb --- /dev/null +++ b/gcc/testsuite/gcc.misc-tests/gcov-pr90574-1.c @@ -0,0 +1,20 @@ +/* { dg-options "-fprofile-arcs -ftest-coverage" } */ +/* { dg-do run { target native } } */ + +int main(int argc, char **argv) +{ + if (argc == 0) + { + int *ptr; +label: /* count(#####) */ + { + } + } + if (argc == 1) + { + __builtin_printf("hello\n"); + } + return 0; +} + +/* { dg-final { run-gcov gcov-pr90574-1.c } } */ diff --git a/gcc/testsuite/gcc.misc-tests/gcov-pr90574-2.c b/gcc/testsuite/gcc.misc-tests/gcov-pr90574-2.c new file mode 100644 index 0000000..2db70c9 --- /dev/null +++ b/gcc/testsuite/gcc.misc-tests/gcov-pr90574-2.c @@ -0,0 +1,15 @@ +/* { dg-options "-fprofile-arcs -ftest-coverage" } */ +/* { dg-do run { target native } } */ + +int main(int argc, char **argv) +{ + switch (argc) + { + case 0: + foo: /* count(#####) */ + case 1:; + } + return 0; +} + +/* { dg-final { run-gcov gcov-pr90574-2.c } } */ diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index 94b2584..a585efe 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -2722,10 +2722,10 @@ stmt_starts_bb_p (gimple *stmt, gimple *prev_stmt) || FORCED_LABEL (gimple_label_label (label_stmt))) return true; - if (prev_stmt && gimple_code (prev_stmt) == GIMPLE_LABEL) + if (glabel *plabel = safe_dyn_cast <glabel *> (prev_stmt)) { - if (DECL_NONLOCAL (gimple_label_label ( - as_a <glabel *> (prev_stmt)))) + if (DECL_NONLOCAL (gimple_label_label (plabel)) + || !DECL_ARTIFICIAL (gimple_label_label (plabel))) return true; cfg_stats.num_merged_labels++; |