From: Marek Polacek <polacek@redhat.com>
To: Joseph Myers <joseph@codesourcery.com>,
GCC Patches <gcc-patches@gcc.gnu.org>,
Jason Merrill <jason@redhat.com>
Cc: Jonathan Wakely <jwakely@redhat.com>
Subject: [PATCH] libcpp: Use [[likely]] conditionally
Date: Mon, 22 Nov 2021 12:22:35 -0500 [thread overview]
Message-ID: <20211122172235.19438-1-polacek@redhat.com> (raw)
Let's hide [[likely]] behind a macro, to suppress warnings if the
compiler doesn't support it.
Co-authored-by: Jonathan Wakely <jwakely@redhat.com>
Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk?
PR preprocessor/103355
libcpp/ChangeLog:
* lex.c: Use ATTR_LIKELY instead of [[likely]].
* system.h (ATTR_LIKELY): Define.
---
libcpp/lex.c | 2 +-
libcpp/system.h | 10 ++++++++++
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/libcpp/lex.c b/libcpp/lex.c
index 94c36f0d014..9c27d8b5a08 100644
--- a/libcpp/lex.c
+++ b/libcpp/lex.c
@@ -1286,7 +1286,7 @@ namespace bidi {
case kind::RTL:
/* These aren't popped by a PDF/PDI. */
break;
- [[likely]] case kind::NONE:
+ ATTR_LIKELY case kind::NONE:
break;
default:
abort ();
diff --git a/libcpp/system.h b/libcpp/system.h
index ee5fbe28889..f6fc583ab80 100644
--- a/libcpp/system.h
+++ b/libcpp/system.h
@@ -422,6 +422,16 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
#define gcc_checking_assert(EXPR) ((void)(0 && (EXPR)))
#endif
+#ifdef __has_cpp_attribute
+# if __has_cpp_attribute(likely)
+# define ATTR_LIKELY [[likely]]
+# elif __has_cpp_attribute(__likely__)
+# define ATTR_LIKELY [[__likely__]]
+# else
+# define ATTR_LIKELY
+# endif
+#endif
+
/* Poison identifiers we do not want to use. */
#if (GCC_VERSION >= 3000)
#undef calloc
base-commit: 1aedb3920a45bfe75db4514502b4e7f83e108f63
--
2.33.1
next reply other threads:[~2021-11-22 17:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 17:22 Marek Polacek [this message]
2021-11-23 0:26 ` Jeff Law
2021-11-23 15:26 ` Christophe LYON
2021-11-23 15:38 ` Marek Polacek
2021-11-23 15:38 ` Jeff Law
2021-11-23 20:34 ` Christophe Lyon
2021-11-23 20:43 ` Jakub Jelinek
2021-11-23 20:43 ` Jeff Law
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=20211122172235.19438-1-polacek@redhat.com \
--to=polacek@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
--cc=joseph@codesourcery.com \
--cc=jwakely@redhat.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).