From 987009bf0d31f2aa399cbf58ddf91a90b09848ca Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Thu, 26 Aug 1999 05:18:44 +0000 Subject: system.h: Don't redefine abort or trim_filename. 1999-08-25 22:10 -0700 Zack Weinberg * system.h: Don't redefine abort or trim_filename. * rtl.h: Define abort to fancy_abort (__FILE__, __LINE__, 0) or fancy_abort (__FILE__, __LINE__, __FUNCTION__) depending on whether or not __FUNCTION__ is available. * tree.h: Duplicate rtl.h's definition of abort, for files that don't include rtl.h. Delete all code to perform type checking with a compiler other than GCC. * varray.h: Delete all code to perform type checking with a compiler other than GCC. Make VARRAY_CHECK() always evaluate its arguments exactly once, using a statement expression. Adjust the VARRAY_ accessor macros to match. * toplev.h (fatal_insn, fatal_insn_not_found): Kill. (_fatal_insn, _fatal_insn_not_found): New fns, take info on caller's location. Define fatal_insn and fatal_insn_not_found as macros that use _fatal_insn and _fatal_insn_not_found. (fancy_abort, trim_filename): Kill prototypes. * rtl.c (trim_filename): Move here from toplev.c. (fancy_abort): New function. (DIR_SEPARATOR): Provide default definition. * tree.c (tree_check_failed, tree_class_check_failed): Go through fancy_abort. (tree_check, tree_class_check, cst_or_constructor_check, expr_check): Delete. * varray.c (varray_check_failed): New function. * toplev.c (fatal_insn, fatal_insn_not_found): Replace with _fatal_insn and _fatal_insn_not_found. Go through fancy_abort. (trim_filename, fancy_abort): Delete. * builtins.c (expand_builtin_args_info): Report ICE with abort. * except.c (start_catch_handler): Report ICE with error/abort combo. * final.c (output_operand_lossage): Likewise. * flow.c (verify_flow_info): Likewise. * gcc.c: Prototype fatal. * gengenrtl.c: Undef abort after including rtl.h not system.h. * genattr.c, genattrtab.c, genemit.c, genextract.c, genflags.c, genopinit.c, genoutput.c, genpeep.c, genrecog.c: Don't define fancy_abort. From-SVN: r28889 --- gcc/tree.h | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) (limited to 'gcc/tree.h') diff --git a/gcc/tree.h b/gcc/tree.h index 82d3cf6..c21ecec 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -312,14 +312,8 @@ struct tree_common /* When checking is enabled, errors will be generated if a tree node is accessed incorrectly. The macros abort with a fatal error. */ +#if defined ENABLE_CHECKING && (__GNUC__ > 2 || __GNUC_MINOR__ > 6) -#ifdef ENABLE_CHECKING - -#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC_MINOR__ > 6) -/* This optimization can only be done in stage2/3, because it - uses statement expressions. You might think that you could use - conditional (?:) expressions, but you would be wrong: these macros - need to evaluate `t' only once. */ #define TREE_CHECK(t, code) \ ({ const tree __t = t; \ if (TREE_CODE(__t) != (code)) \ @@ -357,25 +351,7 @@ extern void tree_class_check_failed PROTO((const tree, char, const char *, int, const char *)) ATTRIBUTE_NORETURN; -#else /* not gcc or old gcc */ - -#define TREE_CHECK(t, code) \ - tree_check (t, code, __FILE__, __LINE__) -#define TREE_CLASS_CHECK(t, code) \ - tree_class_check (t, code, __FILE__, __LINE__) -#define CST_OR_CONSTRUCTOR_CHECK(t) \ - cst_or_constructor_check (t, __FILE__, __LINE__) -#define EXPR_CHECK(t) \ - expr_check (t, __FILE__, __LINE__) - -extern tree tree_check PROTO((const tree, enum tree_code, const char *, int)); -extern tree tree_class_check PROTO((const tree, char, const char *, int)); -extern tree cst_or_constructor_check PROTO((const tree, const char *, int)); -extern tree expr_check PROTO((const tree, enum tree_code, const char *, int)); - -#endif /* not gcc or old gcc */ - -#else /* not ENABLE_CHECKING */ +#else /* not ENABLE_CHECKING, or not gcc */ #define TREE_CHECK(t, code) (t) #define TREE_CLASS_CHECK(t, code) (t) @@ -2425,3 +2401,18 @@ extern void dwarf2out_begin_prologue PROTO((void)); code for a function definition. */ extern void dwarf2out_end_epilogue PROTO((void)); + +/* Redefine abort to report an internal error w/o coredump, and + reporting the location of the error in the source file. This logic + is duplicated in rtl.h and tree.h because every file that needs the + special abort includes one or both. toplev.h gets too few files, + system.h gets too many. */ + +#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7) +extern void fancy_abort PROTO((const char *, int)) ATTRIBUTE_NORETURN; +#define abort() fancy_abort (__FILE__, __LINE__) +#else +extern void fancy_abort PROTO((const char *, int, const char *)) + ATTRIBUTE_NORETURN; +#define abort() fancy_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__) +#endif -- cgit v1.1