Re: [patch] Use __builtin_FILE and __builtin_LINE in assert implementation in C++

[Paul Pluzhnikov <ppluzhnikov@google.com>]

[-- Attachment #1: Type: text/plain, Size: 539 bytes --]

On Sun, Feb 5, 2023 at 2:34 PM Florian Weimer <fweimer@redhat.com> wrote:
>
> * Paul Pluzhnikov:
>
> > +#  if __has_builtin(__builtin_FILE)
> > +#   define __ASSERT_FILE __builtin_FILE()
> > +#   define __ASSERT_LINE __builtin_LINE()

I picked __ASSERT_FILE to match (already used) __ASSERT_FUNCTION.
Mixing __glibc_assert_file with __ASSERT_FUNCTION creates a cognitive
dissonance for me.

How strongly do you feel about this?

> __has_builtin itself needs to be conditionalized. 8-(

Revised patch attached.

Thanks,
-- 
Paul Pluzhnikov

[-- Attachment #2: assert-patch-20230205a.txt --]
[-- Type: text/plain, Size: 1016 bytes --]

diff --git a/assert/assert.h b/assert/assert.h
index 72209bc5e7..a28ad485e9 100644
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -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)								\