diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-08-19 13:44:42 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-08-19 13:44:42 +0200 |
| commit | e92cbe3a1df3f5ad7027d9863c5a49c34cf789e9 (patch) | |
| tree | 23cc5f3b6e29a6efeeed823d7dcca1ea37695e1d /gcc | |
| parent | 53f3815cc08c390d2aee47a252203d416304298c (diff) | |
| download | gcc-e92cbe3a1df3f5ad7027d9863c5a49c34cf789e9.zip gcc-e92cbe3a1df3f5ad7027d9863c5a49c34cf789e9.tar.gz gcc-e92cbe3a1df3f5ad7027d9863c5a49c34cf789e9.tar.bz2 | |
re PR debug/37156 (Hang with -g -O2 (or higher) (discovered with malloc.c in sqlite3))
PR debug/37156
* pretty-print.c (pp_base_format): Deal with recursive BLOCK trees.
* tree.c (block_nonartificial_location): Likewise.
* error.c (cp_print_error_function): Deal with recursive BLOCK trees.
* gcc.dg/pr37156.c: New test.
From-SVN: r139230
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/error.c | 4 | ||||
| -rw-r--r-- | gcc/pretty-print.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr37156.c | 21 | ||||
| -rw-r--r-- | gcc/tree.c | 4 |
7 files changed, 46 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 68e7be6..a170704 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2008-08-19 Jakub Jelinek <jakub@redhat.com> + + PR debug/37156 + * pretty-print.c (pp_base_format): Deal with recursive BLOCK trees. + * tree.c (block_nonartificial_location): Likewise. + 2008-08-19 Richard Guenther <rguenther@suse.de> PR tree-optimization/35972 diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a684338..4ffb96e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2008-08-19 Jakub Jelinek <jakub@redhat.com> + + PR debug/37156 + * error.c (cp_print_error_function): Deal with recursive BLOCK trees. + 2008-08-18 Tomas Bily <tbily@suse.cz> * tree.c (cp_tree_equal): Use CONVERT_EXPR_CODE_P. diff --git a/gcc/cp/error.c b/gcc/cp/error.c index 03ceddf..177d082 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -2388,7 +2388,9 @@ cp_print_error_function (diagnostic_context *context, if (abstract_origin) { ao = BLOCK_ABSTRACT_ORIGIN (abstract_origin); - while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao)) + while (TREE_CODE (ao) == BLOCK + && BLOCK_ABSTRACT_ORIGIN (ao) + && BLOCK_ABSTRACT_ORIGIN (ao) != ao) ao = BLOCK_ABSTRACT_ORIGIN (ao); gcc_assert (TREE_CODE (ao) == FUNCTION_DECL); fndecl = ao; diff --git a/gcc/pretty-print.c b/gcc/pretty-print.c index 35dca7c..fdac10e 100644 --- a/gcc/pretty-print.c +++ b/gcc/pretty-print.c @@ -501,7 +501,9 @@ pp_base_format (pretty_printer *pp, text_info *text) { tree ao = BLOCK_ABSTRACT_ORIGIN (block); - while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao)) + while (TREE_CODE (ao) == BLOCK + && BLOCK_ABSTRACT_ORIGIN (ao) + && BLOCK_ABSTRACT_ORIGIN (ao) != ao) ao = BLOCK_ABSTRACT_ORIGIN (ao); if (TREE_CODE (ao) == FUNCTION_DECL) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e51e9a6..7499840 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-08-19 Jakub Jelinek <jakub@redhat.com> + + PR debug/37156 + * gcc.dg/pr37156.c: New test. + 2008-08-19 Richard Guenther <rguenther@suse.de> PR tree-optimization/35972 diff --git a/gcc/testsuite/gcc.dg/pr37156.c b/gcc/testsuite/gcc.dg/pr37156.c new file mode 100644 index 0000000..e86f595 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr37156.c @@ -0,0 +1,21 @@ +/* PR debug/37156 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -g" } */ + +__attribute__ ((warning ("is experimental"))) int bar (int, int *, int *, int); + +long long foo (void) +{ + int n, m; + long long r; + bar (0, &n, &m, 0); /* { dg-warning "is experimental" } */ + r = (long long) n; + return r; +} + +void +baz (int n) +{ + int o; + o = foo () - n; +} @@ -8819,7 +8819,9 @@ block_nonartificial_location (tree block) { tree ao = BLOCK_ABSTRACT_ORIGIN (block); - while (TREE_CODE (ao) == BLOCK && BLOCK_ABSTRACT_ORIGIN (ao)) + while (TREE_CODE (ao) == BLOCK + && BLOCK_ABSTRACT_ORIGIN (ao) + && BLOCK_ABSTRACT_ORIGIN (ao) != ao) ao = BLOCK_ABSTRACT_ORIGIN (ao); if (TREE_CODE (ao) == FUNCTION_DECL) |