diff options
| author | Zack Weinberg <zack@wolery.cumb.org> | 2000-07-21 07:10:36 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-07-21 07:10:36 +0000 |
| commit | fbfc11925b971a0d73b7253ba71bef3c32c9fb95 (patch) | |
| tree | d19f337e85d3fb553f6806af5174bc4df981e7c8 /gcc/rtl.h | |
| parent | 1b493b8185a04b875c99c0dc4ef63005bb5fc54b (diff) | |
| download | gcc-fbfc11925b971a0d73b7253ba71bef3c32c9fb95.zip gcc-fbfc11925b971a0d73b7253ba71bef3c32c9fb95.tar.gz gcc-fbfc11925b971a0d73b7253ba71bef3c32c9fb95.tar.bz2 | |
diagnostic.c (trim_filename, [...]): Moved here from rtl.c.
* 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.
From-SVN: r35170
Diffstat (limited to 'gcc/rtl.h')
| -rw-r--r-- | gcc/rtl.h | 25 |
1 files changed, 8 insertions, 17 deletions
@@ -223,45 +223,40 @@ typedef struct rtvec_def{ (*({ rtx _rtx = (RTX); int _n = (N); \ enum rtx_code _code = GET_CODE (_rtx); \ if (_n < 0 || _n >= GET_RTX_LENGTH (_code)) \ - rtl_check_failed_bounds (_rtx, _n, __FILE__, __LINE__, \ - __PRETTY_FUNCTION__); \ + rtl_check_failed_bounds (_rtx, _n, __FILE__, __LINE__, __FUNCTION__); \ if (GET_RTX_FORMAT(_code)[_n] != C1) \ - rtl_check_failed_type1 (_rtx, _n, C1, __FILE__, __LINE__, \ - __PRETTY_FUNCTION__); \ + rtl_check_failed_type1(_rtx, _n, C1, __FILE__, __LINE__, __FUNCTION__); \ &_rtx->fld[_n]; })) #define RTL_CHECK2(RTX, N, C1, C2) __extension__ \ (*({ rtx _rtx = (RTX); int _n = (N); \ enum rtx_code _code = GET_CODE (_rtx); \ if (_n < 0 || _n >= GET_RTX_LENGTH (_code)) \ - rtl_check_failed_bounds (_rtx, _n, __FILE__, __LINE__, \ - __PRETTY_FUNCTION__); \ + rtl_check_failed_bounds (_rtx, _n, __FILE__, __LINE__, __FUNCTION__); \ if (GET_RTX_FORMAT(_code)[_n] != C1 \ && GET_RTX_FORMAT(_code)[_n] != C2) \ rtl_check_failed_type2 (_rtx, _n, C1, C2, __FILE__, __LINE__, \ - __PRETTY_FUNCTION__); \ + __FUNCTION__); \ &_rtx->fld[_n]; })) #define RTL_CHECKC1(RTX, N, C) __extension__ \ (*({ rtx _rtx = (RTX); int _n = (N); \ if (GET_CODE (_rtx) != C) \ - rtl_check_failed_code1 (_rtx, C, __FILE__, __LINE__, \ - __PRETTY_FUNCTION__); \ + rtl_check_failed_code1 (_rtx, C, __FILE__, __LINE__, __FUNCTION__); \ &_rtx->fld[_n]; })) #define RTL_CHECKC2(RTX, N, C1, C2) __extension__ \ (*({ rtx _rtx = (RTX); int _n = (N); \ enum rtx_code _code = GET_CODE (_rtx); \ if (_code != C1 && _code != C2) \ - rtl_check_failed_code2 (_rtx, C1, C2, __FILE__, __LINE__, \ - __PRETTY_FUNCTION__); \ + rtl_check_failed_code2(_rtx, C1, C2, __FILE__, __LINE__, __FUNCTION__); \ &_rtx->fld[_n]; })) #define RTVEC_ELT(RTVEC, I) __extension__ \ (*({ rtvec _rtvec = (RTVEC); int _i = (I); \ if (_i < 0 || _i >= GET_NUM_ELEM (_rtvec)) \ rtvec_check_failed_bounds (_rtvec, _i, __FILE__, __LINE__, \ - __PRETTY_FUNCTION__); \ + __FUNCTION__); \ &_rtvec->elem[_i]; })) extern void rtl_check_failed_bounds PARAMS ((rtx, int, @@ -1809,11 +1804,7 @@ extern int read_rtx_lineno; 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__) /* In alias.c */ extern rtx canon_rtx PARAMS ((rtx)); |