diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-07-21 07:10:36 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-07-21 07:10:36 +0000 |
| commit | 19fafbd363af0c07562e77595fc94ad786c4e00f (patch) | |
| tree | d19f337e85d3fb553f6806af5174bc4df981e7c8 /gcc/tree.h | |
| parent | 0dcbd3b4c4705dde230ddad2938b4d54344725d6 (diff) | |
| download | gcc-19fafbd363af0c07562e77595fc94ad786c4e00f.tar.gz | |
* diagnostic.c (trim_filename, fancy_abort): Moved here from
rtl.c.
(fatal_function, set_fatal_function): Removed.
(fatal): Don't prepare for or call the fatal_function.
(diagnostic_lock, error_recursion): New.
(diagnostic_for_decl, report_diagnostic): Guard against
re-entering the error reporting routines.
(fancy_abort): Assume function is not NULL.
* errors.c (fancy_abort): New. Assume function is not NULL.
* tradcpp.c (fancy_abort): Assume function is not NULL.
* system.h: Provide default definition of __FUNCTION__.
* rtl.h: Use __FUNCTION__ not __PRETTY_FUNCTION__ throughout.
Always use __FUNCTION__ in definition of abort.
* tree.h: Likewise.
* varray.h: Likewise.
* toplev.h: Likewise. Don't prototype set_fatal_function.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35170 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree.h')
| -rw-r--r-- | gcc/tree.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/gcc/tree.h b/gcc/tree.h index 39a94c7965b..7a73968fbff 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -281,14 +281,12 @@ struct tree_common #define TREE_CHECK(t, code) __extension__ \ ({ const tree __t = t; \ if (TREE_CODE(__t) != (code)) \ - tree_check_failed (__t, code, __FILE__, \ - __LINE__, __PRETTY_FUNCTION__); \ + tree_check_failed (__t, code, __FILE__, __LINE__, __FUNCTION__); \ __t; }) #define TREE_CLASS_CHECK(t, class) __extension__ \ ({ const tree __t = t; \ if (TREE_CODE_CLASS(TREE_CODE(__t)) != (class)) \ - tree_class_check_failed (__t, class, __FILE__, \ - __LINE__, __PRETTY_FUNCTION__); \ + tree_class_check_failed (__t, class, __FILE__, __LINE__, __FUNCTION__); \ __t; }) /* These checks have to be special cased. */ @@ -296,16 +294,14 @@ struct tree_common ({ const tree __t = t; \ enum tree_code __c = TREE_CODE(__t); \ if (__c != CONSTRUCTOR && TREE_CODE_CLASS(__c) != 'c') \ - tree_check_failed (__t, CONSTRUCTOR, __FILE__, \ - __LINE__, __PRETTY_FUNCTION__); \ + tree_check_failed (__t, CONSTRUCTOR, __FILE__, __LINE__, __FUNCTION__); \ __t; }) #define EXPR_CHECK(t) __extension__ \ ({ const tree __t = t; \ char __c = TREE_CODE_CLASS(TREE_CODE(__t)); \ if (__c != 'r' && __c != 's' && __c != '<' \ && __c != '1' && __c != '2' && __c != 'e') \ - tree_class_check_failed(__t, 'e', __FILE__, \ - __LINE__, __PRETTY_FUNCTION__); \ + tree_class_check_failed(__t, 'e', __FILE__, __LINE__, __FUNCTION__); \ __t; }) extern void tree_check_failed PARAMS ((const tree, enum tree_code, @@ -2876,8 +2872,4 @@ extern void dwarf2out_end_epilogue PARAMS ((void)); extern void fancy_abort PARAMS ((const char *, int, const char *)) ATTRIBUTE_NORETURN; -#if (GCC_VERSION >= 2007) -#define abort() fancy_abort (__FILE__, __LINE__, __PRETTY_FUNCTION__) -#else -#define abort() fancy_abort (__FILE__, __LINE__, 0) -#endif +#define abort() fancy_abort (__FILE__, __LINE__, __FUNCTION__) |