From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 3DA883839430 for ; Thu, 22 Jul 2021 13:38:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3DA883839430 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-234-LJSv2LQbOo2vp5x-pTj8kQ-1; Thu, 22 Jul 2021 09:38:20 -0400 X-MC-Unique: LJSv2LQbOo2vp5x-pTj8kQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 72139100D1A4; Thu, 22 Jul 2021 13:38:19 +0000 (UTC) Received: from localhost (unknown [10.33.36.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id EB1BC5C1A1; Thu, 22 Jul 2021 13:38:18 +0000 (UTC) Date: Thu, 22 Jul 2021 14:38:18 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Use std::addressof in ranges::uninitialized_xxx [PR101571] Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="FEFHqhY4BYBH+Zyz" Content-Disposition: inline X-Spam-Status: No, score=-14.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2021 13:38:23 -0000 --FEFHqhY4BYBH+Zyz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Make the ranges::uninitialized_xxx algorithms use std::addressof to protect against iterator types that overload operator&. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: PR libstdc++/101571 * include/bits/ranges_uninitialized.h (_DestroyGuard): Change constructor parameter to reference and use addressof. * testsuite/util/testsuite_iterators.h: Define deleted operator& overloads for test iterators. Tested powerpc64le-linux. Committed to trunk. I'll backport this after the 11.2 release as well. --FEFHqhY4BYBH+Zyz Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit aca7a0253d6e3116f846ad530b19d89644a64267 Author: Jonathan Wakely Date: Thu Jul 22 14:37:24 2021 libstdc++: Use std::addressof in ranges::uninitialized_xxx [PR101571] Make the ranges::uninitialized_xxx algorithms use std::addressof to protect against iterator types that overload operator&. Signed-off-by: Jonathan Wakely libstdc++-v3/ChangeLog: PR libstdc++/101571 * include/bits/ranges_uninitialized.h (_DestroyGuard): Change constructor parameter to reference and use addressof. * testsuite/util/testsuite_iterators.h: Define deleted operator& overloads for test iterators. diff --git a/libstdc++-v3/include/bits/ranges_uninitialized.h b/libstdc++-v3/include/bits/ranges_uninitialized.h index 0a46fba9b8e..40664ea7a04 100644 --- a/libstdc++-v3/include/bits/ranges_uninitialized.h +++ b/libstdc++-v3/include/bits/ranges_uninitialized.h @@ -106,8 +106,8 @@ namespace ranges public: explicit - _DestroyGuard(const _Iter* __iter) - : _M_first(*__iter), _M_cur(__iter) + _DestroyGuard(const _Iter& __iter) + : _M_first(__iter), _M_cur(std::__addressof(__iter)) { } void @@ -127,7 +127,7 @@ namespace ranges struct _DestroyGuard<_Iter> { explicit - _DestroyGuard(const _Iter*) + _DestroyGuard(const _Iter&) { } void @@ -149,7 +149,7 @@ namespace ranges return ranges::next(__first, __last); else { - auto __guard = __detail::_DestroyGuard(&__first); + auto __guard = __detail::_DestroyGuard(__first); for (; __first != __last; ++__first) ::new (__detail::__voidify(*__first)) _ValueType; __guard.release(); @@ -181,7 +181,7 @@ namespace ranges return ranges::next(__first, __n); else { - auto __guard = __detail::_DestroyGuard(&__first); + auto __guard = __detail::_DestroyGuard(__first); for (; __n > 0; ++__first, (void) --__n) ::new (__detail::__voidify(*__first)) _ValueType; __guard.release(); @@ -207,7 +207,7 @@ namespace ranges return ranges::fill(__first, __last, _ValueType()); else { - auto __guard = __detail::_DestroyGuard(&__first); + auto __guard = __detail::_DestroyGuard(__first); for (; __first != __last; ++__first) ::new (__detail::__voidify(*__first)) _ValueType(); __guard.release(); @@ -240,7 +240,7 @@ namespace ranges return ranges::fill_n(__first, __n, _ValueType()); else { - auto __guard = __detail::_DestroyGuard(&__first); + auto __guard = __detail::_DestroyGuard(__first); for (; __n > 0; ++__first, (void) --__n) ::new (__detail::__voidify(*__first)) _ValueType(); __guard.release(); @@ -279,7 +279,7 @@ namespace ranges } else { - auto __guard = __detail::_DestroyGuard(&__ofirst); + auto __guard = __detail::_DestroyGuard(__ofirst); for (; __ifirst != __ilast && __ofirst != __olast; ++__ofirst, (void)++__ifirst) ::new (__detail::__voidify(*__ofirst)) _OutType(*__ifirst); @@ -326,7 +326,7 @@ namespace ranges } else { - auto __guard = __detail::_DestroyGuard(&__ofirst); + auto __guard = __detail::_DestroyGuard(__ofirst); for (; __n > 0 && __ofirst != __olast; ++__ofirst, (void)++__ifirst, (void)--__n) ::new (__detail::__voidify(*__ofirst)) _OutType(*__ifirst); @@ -368,7 +368,7 @@ namespace ranges } else { - auto __guard = __detail::_DestroyGuard(&__ofirst); + auto __guard = __detail::_DestroyGuard(__ofirst); for (; __ifirst != __ilast && __ofirst != __olast; ++__ofirst, (void)++__ifirst) ::new (__detail::__voidify(*__ofirst)) @@ -419,7 +419,7 @@ namespace ranges } else { - auto __guard = __detail::_DestroyGuard(&__ofirst); + auto __guard = __detail::_DestroyGuard(__ofirst); for (; __n > 0 && __ofirst != __olast; ++__ofirst, (void)++__ifirst, (void)--__n) ::new (__detail::__voidify(*__ofirst)) @@ -446,7 +446,7 @@ namespace ranges return ranges::fill(__first, __last, __x); else { - auto __guard = __detail::_DestroyGuard(&__first); + auto __guard = __detail::_DestroyGuard(__first); for (; __first != __last; ++__first) ::new (__detail::__voidify(*__first)) _ValueType(__x); __guard.release(); @@ -479,7 +479,7 @@ namespace ranges return ranges::fill_n(__first, __n, __x); else { - auto __guard = __detail::_DestroyGuard(&__first); + auto __guard = __detail::_DestroyGuard(__first); for (; __n > 0; ++__first, (void)--__n) ::new (__detail::__voidify(*__first)) _ValueType(__x); __guard.release(); diff --git a/libstdc++-v3/testsuite/util/testsuite_iterators.h b/libstdc++-v3/testsuite/util/testsuite_iterators.h index 6b835ac475e..d0f87b1cd4e 100644 --- a/libstdc++-v3/testsuite/util/testsuite_iterators.h +++ b/libstdc++-v3/testsuite/util/testsuite_iterators.h @@ -175,10 +175,14 @@ namespace __gnu_test #if __cplusplus >= 201103L template void operator,(const U&) const = delete; + + void operator&() const = delete; #else private: template void operator,(const U&) const; + + void operator&() const; #endif }; @@ -288,10 +292,14 @@ namespace __gnu_test #if __cplusplus >= 201103L template void operator,(const U&) const = delete; + + void operator&() const = delete; #else private: template void operator,(const U&) const; + + void operator&() const; #endif }; --FEFHqhY4BYBH+Zyz--