X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fcommon%2Fgdb_assert.h;h=a719d878990490847de5948a5cf738091ddc3ae3;hb=5b0e2db4fa08b43e9ff78d6e9a45d496522bd241;hp=28e8da4f7475c9ba5f056e4f90e0e998994d412b;hpb=28e7fd62340426746f9c896cbc40c5d374ec47aa;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/common/gdb_assert.h b/gdb/common/gdb_assert.h
index 28e8da4f74..a719d87899 100644
--- a/gdb/common/gdb_assert.h
+++ b/gdb/common/gdb_assert.h
@@ -1,5 +1,5 @@
 /* GDB-friendly replacement for <assert.h>.
-   Copyright (C) 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 2000-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -16,14 +16,13 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_ASSERT_H
-#define GDB_ASSERT_H
+#ifndef COMMON_GDB_ASSERT_H
+#define COMMON_GDB_ASSERT_H
 
 /* A static assertion.  This will cause a compile-time error if EXPR,
    which must be a compile-time constant, is false.  */
 
-#define gdb_static_assert(expr) \
-  extern int never_defined_just_used_for_checking[(expr) ? 1 : -1]
+#define gdb_static_assert(expr) static_assert (expr, "")
 
 /* PRAGMATICS: "gdb_assert.h":gdb_assert() is a lower case (rather
    than upper case) macro since that provides the closest fit to the
@@ -32,24 +31,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,12 +48,12 @@
 /* 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))
 #endif
 
-#endif /* gdb_assert.h */
+#endif /* COMMON_GDB_ASSERT_H */