diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 2000-11-15 10:50:51 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2000-11-15 10:50:51 -0500 |
| commit | ee3400e881ef5870dd6b1d274dfcd09c73828a1a (patch) | |
| tree | f927bdafd430a86ad8fdd9549af9b7897ba84be5 /gcc/cp | |
| parent | 12e1243e426a12358e793cef2735e77c37452ec7 (diff) | |
| download | gcc-ee3400e881ef5870dd6b1d274dfcd09c73828a1a.zip gcc-ee3400e881ef5870dd6b1d274dfcd09c73828a1a.tar.gz gcc-ee3400e881ef5870dd6b1d274dfcd09c73828a1a.tar.bz2 | |
diagnostic.c (finish_abort): New fn.
* diagnostic.c (finish_abort): New fn.
(fancy_abort, error_recursion): Use it.
* toplev.c (crash_signal): Likewise.
* diagnostic.h: Declare it.
* typeck2.c (friendly_abort): Uncount the error before handing
off to fancy_abort.
From-SVN: r37480
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/typeck2.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 881ad2b..c5a369c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2000-11-15 Jason Merrill <jason@redhat.com> + + * typeck2.c (friendly_abort): Uncount the error before handing + off to fancy_abort. + 2000-11-15 Nathan Sidwell <nathan@codesourcery.com> * typeck.c (lookup_anon_field): Cope with qv qualifiers. diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 9141c6f..b030a05 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -259,6 +259,9 @@ friendly_abort (where, file, line, func) if (where > 0) error ("Internal error #%d.", where); + /* Uncount this error, so finish_abort will do the right thing. */ + --errorcount; + fancy_abort (file, line, func); } |