public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r11-3339] libstdc++: Use __builtin_expect in __glibcxx_assert
Date: Mon, 21 Sep 2020 22:43:35 +0000 (GMT)	[thread overview]
Message-ID: <20200921224335.3EC16385783D@sourceware.org> (raw)

https://gcc.gnu.org/g:7db5967f1050eb2b45e920b13d495d92ba4f16f4

commit r11-3339-g7db5967f1050eb2b45e920b13d495d92ba4f16f4
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Sep 21 23:43:25 2020 +0100

    libstdc++: Use __builtin_expect in __glibcxx_assert
    
    libstdc++-v3/ChangeLog:
    
            * include/bits/c++config (__replacement_assert): Add noreturn
            attribute.
            (__glibcxx_assert_impl): Use __builtin_expect to hint that the
            assertion is expected to pass.

Diff:
---
 libstdc++-v3/include/bits/c++config | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index badf9d01a04..860bf6dbcb3 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -468,7 +468,8 @@ namespace std
 {
   // Avoid the use of assert, because we're trying to keep the <cassert>
   // include out of the mix.
-  extern "C++" inline void
+  extern "C++" _GLIBCXX_NORETURN
+  inline void
   __replacement_assert(const char* __file, int __line,
 		       const char* __function, const char* __condition)
   {
@@ -478,7 +479,7 @@ namespace std
   }
 }
 #define __glibcxx_assert_impl(_Condition)			       \
-  if (!bool(_Condition))					       \
+  if (__builtin_expect(!bool(_Condition), false))		       \
     std::__replacement_assert(__FILE__, __LINE__, __PRETTY_FUNCTION__, \
 			      #_Condition)
 #endif


                 reply	other threads:[~2020-09-21 22:43 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20200921224335.3EC16385783D@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /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).