OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

typeck2.c (friendly_abort): Delete definition.

Browse Source 
* typeck2.c (friendly_abort): Delete definition.
	* cp-tree.h (friendly_abort): Don't prototype.
	(my_friendly_assert): Use fancy_abort.

From-SVN: r49152
This commit is contained in:
Zack Weinberg 2002-01-23 19:41:15 +00:00
parent a63bea75b1
commit c588e52b27
3 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2002-01-23 Zack Weinberg <zack@codesourcery.com>
* typeck2.c (friendly_abort): Delete definition.
* cp-tree.h (friendly_abort): Don't prototype.
(my_friendly_assert): Use fancy_abort.
2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org> 2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org>
* cp-tree.h (my_friendly_abort): Remove. * cp-tree.h (my_friendly_abort): Remove.
@ -17,9 +23,9 @@
2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org> 2002-01-23 Craig Rodrigues <rodrigc@gcc.gnu.org>
* call.c, class.c, decl.c, decl2.c, error.c, expr.c, friend.c, * call.c, class.c, decl.c, decl2.c, error.c, expr.c, friend.c,
init.c, lex.c, mangle.c, method.c, pt.c, repo.c, rtti.c, search.c, init.c, lex.c, mangle.c, method.c, pt.c, repo.c, rtti.c, search.c,
semantics.c, spew.c, tree.c, typeck.c, typeck2.c, xref.c: semantics.c, spew.c, tree.c, typeck.c, typeck2.c, xref.c:
Change my_fancy_abort() to abort(). Change my_fancy_abort() to abort().
2002-01-23 Jason Merrill <jason@redhat.com> 2002-01-23 Jason Merrill <jason@redhat.com>
@ -171,7 +177,7 @@
(BINDING_TYPE): Whitespace. (BINDING_TYPE): Whitespace.
(IDENTIFIER_GLOBAL_VALUE): Add parenthesis. (IDENTIFIER_GLOBAL_VALUE): Add parenthesis.
(SET_IDENTIFIER_GLOBAL_VALUE): Likewise. (SET_IDENTIFIER_GLOBAL_VALUE): Likewise.
(IDENTIFIER_NAMESPACE_VALUE): Likewise. (IDENTIFIER_NAMESPACE_VALUE): Likewise.
(SET_IDENTIFIER_NAMESPACE_VALUE: Likewise. (SET_IDENTIFIER_NAMESPACE_VALUE: Likewise.
(same_type_p): Uppercase macro parameters. (same_type_p): Uppercase macro parameters.
(same_type_ignoring_top_level_qualifiers_p): Likewise. (same_type_ignoring_top_level_qualifiers_p): Likewise.
@ -380,7 +386,7 @@
PR c++/5116, c++/764 reversion PR c++/5116, c++/764 reversion
* call.c (build_new_op): Revert the instantiations. They are * call.c (build_new_op): Revert the instantiations. They are
incorrect. incorrect.
2002-01-02 Nathan Sidwell <nathan@codesourcery.com> 2002-01-02 Nathan Sidwell <nathan@codesourcery.com>
PR c++/5089 PR c++/5089
@ -462,7 +468,7 @@
* cvt.c (convert_to_reference): Likewise. * cvt.c (convert_to_reference): Likewise.
* semantics.c (setup_vtbl_ptr): Likewise. * semantics.c (setup_vtbl_ptr): Likewise.
* pt.c (lookup_template_class): Comment typo. * pt.c (lookup_template_class): Comment typo.
2001-12-29 Nathan Sidwell <nathan@codesourcery.com> 2001-12-29 Nathan Sidwell <nathan@codesourcery.com>
PR c++/5125 PR c++/5125

5
gcc/cp/cp-tree.h
View File

@ -4349,12 +4349,9 @@ extern tree error_not_base_type PARAMS ((tree, tree));
extern tree binfo_or_else PARAMS ((tree, tree)); extern tree binfo_or_else PARAMS ((tree, tree));
extern void readonly_error PARAMS ((tree, const char *, int)); extern void readonly_error PARAMS ((tree, const char *, int));
extern int abstract_virtuals_error PARAMS ((tree, tree)); extern int abstract_virtuals_error PARAMS ((tree, tree));
extern void friendly_abort PARAMS ((int, const char *,
int, const char *))
ATTRIBUTE_NORETURN;
#define my_friendly_assert(EXP, N) (void) \ #define my_friendly_assert(EXP, N) (void) \
(((EXP) == 0) ? (friendly_abort (N, __FILE__, __LINE__, __FUNCTION__), 0) : 0) (((EXP) == 0) ? (fancy_abort (__FILE__, __LINE__, __FUNCTION__), 0) : 0)
extern tree store_init_value PARAMS ((tree, tree)); extern tree store_init_value PARAMS ((tree, tree));
extern tree digest_init PARAMS ((tree, tree, tree *)); extern tree digest_init PARAMS ((tree, tree, tree *));

24
gcc/cp/typeck2.c
View File

@ -252,30 +252,6 @@ retry:
} }
} }
/* This is a wrapper around fancy_abort, as used in the back end and
other front ends. It will also report the magic number assigned to
this particular abort. That is for backward compatibility with the
old C++ abort handler, which would just report the magic number. */
void
friendly_abort (where, file, line, func)
int where;
const char *file;
int line;
const char *func;
{
if (errorcount > 0 || sorrycount > 0)
/* Say nothing. */;
else if (where > 0)
{
error ("internal error #%d", where);
/* Uncount this error, so internal_error will do the right thing. */
--errorcount;
}
fancy_abort (file, line, func);
}
/* Perform appropriate conversions on the initial value of a variable, /* Perform appropriate conversions on the initial value of a variable,
store it in the declaration DECL, store it in the declaration DECL,