diff options
| author | Doug Evans <dje@google.com> | 2014-01-17 10:00:07 -0800 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 2014-01-17 10:00:07 -0800 |
| commit | df049a5831c7c573698b98bfd4bc0ec8dc854c1f (patch) | |
| tree | 61be8d087595fb6b54328f8db7e9e0f950cb28f6 /gdb/common/gdb_assert.h | |
| parent | ea38d2a92e349df1f6438c1bd7b899f4cd951321 (diff) | |
| download | gdb-df049a5831c7c573698b98bfd4bc0ec8dc854c1f.zip gdb-df049a5831c7c573698b98bfd4bc0ec8dc854c1f.tar.gz gdb-df049a5831c7c573698b98bfd4bc0ec8dc854c1f.tar.bz2 | |
Move ASSERT_FUNCTION to FUNCTION_NAME.
* common/common-utils.h (FUNCTION_NAME): Renamed from ASSERT_FUNCTION,
and moved here ...
* common/gdb_assert.h (ASSERT_FUNCTION): ... from here.
#include "common-utils.h".
(gdb_assert, gdb_assert_fail, gdb_assert_not_reached): Update.
* common/vec.h (VEC_ASSERT_PASS): Update.
* darwin-nat.h: Replace #include of gdb_assert.h with common-utils.h.
(MACH_CHECK_ERROR): Update.
Diffstat (limited to 'gdb/common/gdb_assert.h')
| -rw-r--r-- | gdb/common/gdb_assert.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/gdb/common/gdb_assert.h b/gdb/common/gdb_assert.h index 50f7bf2..4869fc4 100644 --- a/gdb/common/gdb_assert.h +++ b/gdb/common/gdb_assert.h @@ -19,6 +19,8 @@ #ifndef GDB_ASSERT_H #define GDB_ASSERT_H +#include "common-utils.h" /* For FUNCTION_NAME. */ + /* A static assertion. This will cause a compile-time error if EXPR, which must be a compile-time constant, is false. */ @@ -32,24 +34,11 @@ #define gdb_assert(expr) \ ((void) ((expr) ? 0 : \ - (gdb_assert_fail (#expr, __FILE__, __LINE__, ASSERT_FUNCTION), 0))) - -/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__' - which contains the name of the function currently being defined. - This is broken in G++ before version 2.6. - C9x has a similar variable called __func__, but prefer the GCC one since - it demangles C++ function names. */ -#if (GCC_VERSION >= 2004) -#define ASSERT_FUNCTION __PRETTY_FUNCTION__ -#else -#if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L -#define ASSERT_FUNCTION __func__ -#endif -#endif + (gdb_assert_fail (#expr, __FILE__, __LINE__, FUNCTION_NAME), 0))) /* This prints an "Assertion failed" message, asking the user if they want to continue, dump core, or just exit. */ -#if defined (ASSERT_FUNCTION) +#if defined (FUNCTION_NAME) #define gdb_assert_fail(assertion, file, line, function) \ internal_error (file, line, _("%s: Assertion `%s' failed."), \ function, assertion) @@ -62,9 +51,9 @@ /* The canonical form of gdb_assert (0). MESSAGE is a string to include in the error message. */ -#if defined (ASSERT_FUNCTION) +#if defined (FUNCTION_NAME) #define gdb_assert_not_reached(message) \ - internal_error (__FILE__, __LINE__, "%s: %s", ASSERT_FUNCTION, _(message)) + internal_error (__FILE__, __LINE__, "%s: %s", FUNCTION_NAME, _(message)) #else #define gdb_assert_not_reached(message) \ internal_error (__FILE__, __LINE__, _(message)) |