public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: "Franथईois Dumont" <fdumont@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r12-2824] libstdc++: [_GLIBCXX_DEBUG] Avoid allocator operator== when always equal
Date: Mon,  9 Aug 2021 18:49:15 +0000 (GMT)	[thread overview]
Message-ID: <20210809184915.32258385701B@sourceware.org> (raw)

https://gcc.gnu.org/g:1354603bf7d2ef8cd0cb1f76e801732020502987

commit r12-2824-g1354603bf7d2ef8cd0cb1f76e801732020502987
Author: François Dumont <fdumont@gcc.gnu.org>
Date:   Mon Aug 9 11:55:43 2021 +0200

    libstdc++: [_GLIBCXX_DEBUG] Avoid allocator operator== when always equal
    
    Use std::allocator_traits::is_always_equal to find out if we need to compare
    allocator instances on safe container allocator aware move constructor.
    
    libstdc++-v3/ChangeLog:
    
            * include/debug/safe_container.h
            (_Safe_container(_Safe_container&&, const _Alloc&, std::true_type)): New.
            (_Safe_container(_Safe_container&&, const _Alloc&, std::false_type)): New.
            (_Safe_container(_Safe_container&&, const _Alloc&)): Use latters.

Diff:
---
 libstdc++-v3/include/debug/safe_container.h | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/debug/safe_container.h b/libstdc++-v3/include/debug/safe_container.h
index d9636c29e9b..97c47167fe8 100644
--- a/libstdc++-v3/include/debug/safe_container.h
+++ b/libstdc++-v3/include/debug/safe_container.h
@@ -57,7 +57,12 @@ namespace __gnu_debug
       _Safe_container(const _Safe_container&) = default;
       _Safe_container(_Safe_container&&) = default;
 
-      _Safe_container(_Safe_container&& __x, const _Alloc& __a)
+    private:
+      _Safe_container(_Safe_container&& __x, const _Alloc&, std::true_type)
+      : _Safe_container(std::move(__x))
+      { }
+
+      _Safe_container(_Safe_container&& __x, const _Alloc& __a, std::false_type)
       : _Safe_container()
       {
 	if (__x._M_cont().get_allocator() == __a)
@@ -65,6 +70,12 @@ namespace __gnu_debug
 	else
 	  __x._M_invalidate_all();
       }
+
+    protected:
+      _Safe_container(_Safe_container&& __x, const _Alloc& __a)
+      : _Safe_container(std::move(__x), __a,
+		      typename std::allocator_traits<_Alloc>::is_always_equal{})
+      { }
 #endif
 
     public:


                 reply	other threads:[~2021-08-09 18:49 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=20210809184915.32258385701B@sourceware.org \
    --to=fdumont@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).