From: Paul Pluzhnikov <ppluzhnikov@google.com>
To: Florian Weimer <fweimer@redhat.com>
Cc: Jonathan Wakely <jwakely@redhat.com>,
Szabolcs Nagy <szabolcs.nagy@arm.com>,
Rich Felker <dalias@libc.org>,
Paul Pluzhnikov via Libc-alpha <libc-alpha@sourceware.org>
Subject: Re: [patch] Use __builtin_FILE and __builtin_LINE in assert implementation in C++
Date: Sun, 5 Feb 2023 13:51:25 -0800 [thread overview]
Message-ID: <CALoOobOrLfwEU=ABXD9Z_ajbP+sbmD6RcmXSb1aRo8gx2cyzZQ@mail.gmail.com> (raw)
In-Reply-To: <871qn3yix8.fsf@oldenburg.str.redhat.com>
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
On Sun, Feb 5, 2023 at 12:08 PM Florian Weimer <fweimer@redhat.com> wrote:
> As I said before, use of these builtins needs to be conditionalized.
Yes (revised patch attached).
I was more asking whether there were any fundamental objections.
Thanks,
--
Paul Pluzhnikov
[-- Attachment #2: assert-patch-20230205.txt --]
[-- Type: text/plain, Size: 940 bytes --]
diff --git a/assert/assert.h b/assert/assert.h
index 72209bc5e7..6edcb01d0a 100644
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -86,10 +86,18 @@ __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 __has_builtin(__builtin_FILE)
+# define __ASSERT_FILE __builtin_FILE()
+# define __ASSERT_LINE __builtin_LINE()
+# else
+# 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) \
next prev parent reply other threads:[~2023-02-05 21:51 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-17 19:28 Paul Pluzhnikov
2023-01-23 14:26 ` Florian Weimer
2023-01-24 11:10 ` Rich Felker
2023-01-24 11:19 ` Rich Felker
2023-01-24 11:19 ` Florian Weimer
2023-01-24 11:23 ` Rich Felker
2023-01-24 11:53 ` Jonathan Wakely
2023-01-24 12:08 ` Florian Weimer
2023-01-24 12:17 ` Jonathan Wakely
2023-01-24 15:07 ` Szabolcs Nagy
2023-01-24 15:51 ` Jonathan Wakely
2023-01-26 19:18 ` Paul Pluzhnikov
2023-01-27 15:43 ` Jonathan Wakely
2023-02-05 18:39 ` Paul Pluzhnikov
2023-02-05 20:08 ` Florian Weimer
2023-02-05 21:51 ` Paul Pluzhnikov [this message]
2023-02-05 22:34 ` Florian Weimer
2023-02-05 22:55 ` Paul Pluzhnikov
2023-02-06 6:01 ` Florian Weimer
2023-02-06 16:25 ` Paul Pluzhnikov
2023-02-08 21:43 ` Paul Pluzhnikov
2023-01-25 20:50 ` Paul Pluzhnikov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CALoOobOrLfwEU=ABXD9Z_ajbP+sbmD6RcmXSb1aRo8gx2cyzZQ@mail.gmail.com' \
--to=ppluzhnikov@google.com \
--cc=dalias@libc.org \
--cc=fweimer@redhat.com \
--cc=jwakely@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=szabolcs.nagy@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).