mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
Use __builtin_FILE instead of __FILE__ in assert in C++.
Likewise use __builtin_LINE instead of __LINE__. When building C++, inline functions are required to have the exact same sequence of tokens in every translation unit. But __FILE__ token, when used in a header file, does not necessarily expand to the exact same string literal, and that may cause compilation failure when C++ modules are being used. (It would also cause unpredictable output on assertion failure at runtime, but this rarely matters in practice.) For example, given the following sources: // a.h #include <assert.h> inline void fn () { assert (0); } // a.cc #include "a.h" // b.cc #include "foo/../a.h" preprocessing a.cc will yield a call to __assert_fail("0", "a.h", ...) but b.cc will yield __assert_fail("0", "foo/../a.h", ...)
This commit is contained in:
parent
63550530d9
commit
e42ec82219
@ -86,10 +86,21 @@ __END_DECLS
|
||||
parentheses around EXPR. Otherwise, those added parentheses would
|
||||
suppress warnings we'd expect to be detected by gcc's -Wparentheses. */
|
||||
# if defined __cplusplus
|
||||
# if defined __has_builtin
|
||||
# if __has_builtin (__builtin_FILE)
|
||||
# define __ASSERT_FILE __builtin_FILE ()
|
||||
# define __ASSERT_LINE __builtin_LINE ()
|
||||
# endif
|
||||
# endif
|
||||
# if !defined __ASSERT_FILE
|
||||
# define __ASSERT_FILE __FILE__
|
||||
# define __ASSERT_LINE __LINE__
|
||||
# endif
|
||||
# define assert(expr) \
|
||||
(static_cast <bool> (expr) \
|
||||
? void (0) \
|
||||
: __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION))
|
||||
: __assert_fail (#expr, __ASSERT_FILE, __ASSERT_LINE, \
|
||||
__ASSERT_FUNCTION))
|
||||
# elif !defined __GNUC__ || defined __STRICT_ANSI__
|
||||
# define assert(expr) \
|
||||
((expr) \
|
||||
|
Loading…
Reference in New Issue
Block a user