diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-19 11:44:42 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-19 11:44:42 +0000 |
| commit | c112531f6ff0d0005a6d278578d076777db0178b (patch) | |
| tree | 23cc5f3b6e29a6efeeed823d7dcca1ea37695e1d /gcc/cp | |
| parent | 02067dc53cf72664671a7c7b23ba05218861e2a2 (diff) | |
| download | gcc-c112531f6ff0d0005a6d278578d076777db0178b.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@139230 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/error.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a684338d654..4ffb96e85de 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 03ceddffb78..177d082f98a 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; |