llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-libcxx Author: Mark de Wever (mordante) <details> <summary>Changes</summary> This set usage of operator& instead of std::addressof seems not be easy to "abuse". Some seem easy to misuse, like basic_ostream::operator<<, trying to do that results in compilation errors since the `widen` function is not specialized for the hijacking character type. Hence there are no tests. --- Patch is 34.49 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/128351.diff 23 Files Affected: - (modified) libcxx/include/__atomic/atomic.h (+1-1) - (modified) libcxx/include/__atomic/atomic_ref.h (+1-1) - (modified) libcxx/include/__charconv/traits.h (+2-1) - (modified) libcxx/include/__filesystem/path.h (+2-1) - (modified) libcxx/include/__functional/hash.h (+6-5) - (modified) libcxx/include/__iterator/aliasing_iterator.h (+1-1) - (modified) libcxx/include/__locale (+2-1) - (modified) libcxx/include/__mdspan/layout_left.h (+1-1) - (modified) libcxx/include/__mdspan/layout_right.h (+1-1) - (modified) libcxx/include/__mdspan/layout_stride.h (+4-3) - (modified) libcxx/include/__mdspan/mdspan.h (+1-1) - (modified) libcxx/include/__memory/shared_count.h (+3-2) - (modified) libcxx/include/__ostream/basic_ostream.h (+5-4) - (modified) libcxx/include/__split_buffer (+3-3) - (modified) libcxx/include/__stop_token/intrusive_shared_ptr.h (+2-1) - (modified) libcxx/include/__string/constexpr_c_functions.h (+1-1) - (modified) libcxx/include/__thread/thread.h (+2-1) - (modified) libcxx/include/cwchar (+2-1) - (modified) libcxx/include/fstream (+5-5) - (modified) libcxx/include/future (+7-7) - (modified) libcxx/include/locale (+3-2) - (modified) libcxx/include/regex (+26-25) - (modified) libcxx/include/string (+2-2) ``````````diff diff --git a/libcxx/include/__atomic/atomic.h b/libcxx/include/__atomic/atomic.h index 975a479e20400..8a0996a478e2f 100644 --- a/libcxx/include/__atomic/atomic.h +++ b/libcxx/include/__atomic/atomic.h @@ -361,7 +361,7 @@ struct atomic<_Tp> : __atomic_base<_Tp> { // https://github.com/llvm/llvm-project/issues/47978 // clang bug: __old is not updated on failure for atomic<long double>::compare_exchange_weak // Note __old = __self.load(memory_order_relaxed) will not work - std::__cxx_atomic_load_inplace(std::addressof(__self.__a_), &__old, memory_order_relaxed); + std::__cxx_atomic_load_inplace(std::addressof(__self.__a_), std::addressof(__old), memory_order_relaxed); } # endif __new = __operation(__old, __operand); diff --git a/libcxx/include/__atomic/atomic_ref.h b/libcxx/include/__atomic/atomic_ref.h index 177ea646b6cd0..b5493662c518e 100644 --- a/libcxx/include/__atomic/atomic_ref.h +++ b/libcxx/include/__atomic/atomic_ref.h @@ -119,7 +119,7 @@ struct __atomic_ref_base { // that the pointer is going to be aligned properly at runtime because that is a (checked) precondition // of atomic_ref's constructor. static constexpr bool is_always_lock_free = - __atomic_always_lock_free(sizeof(_Tp), &__get_aligner_instance<required_alignment>::__instance); + __atomic_always_lock_free(sizeof(_Tp), std::addressof(__get_aligner_instance<required_alignment>::__instance)); _LIBCPP_HIDE_FROM_ABI bool is_lock_free() const noexcept { return __atomic_is_lock_free(sizeof(_Tp), __ptr_); } diff --git a/libcxx/include/__charconv/traits.h b/libcxx/include/__charconv/traits.h index 2cb37c8cfb023..dd1fa2354436a 100644 --- a/libcxx/include/__charconv/traits.h +++ b/libcxx/include/__charconv/traits.h @@ -15,6 +15,7 @@ #include <__charconv/tables.h> #include <__charconv/to_chars_base_10.h> #include <__config> +#include <__memory/addressof.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_unsigned.h> #include <cstdint> @@ -142,7 +143,7 @@ __mul_overflowed(unsigned short __a, _Tp __b, unsigned short& __r) { template <typename _Tp> inline _LIBCPP_CONSTEXPR_SINCE_CXX23 _LIBCPP_HIDE_FROM_ABI bool __mul_overflowed(_Tp __a, _Tp __b, _Tp& __r) { static_assert(is_unsigned<_Tp>::value, ""); - return __builtin_mul_overflow(__a, __b, &__r); + return __builtin_mul_overflow(__a, __b, std::addressof(__r)); } template <typename _Tp, typename _Up> diff --git a/libcxx/include/__filesystem/path.h b/libcxx/include/__filesystem/path.h index 698ae209ae1f8..a2c28bfd79bb9 100644 --- a/libcxx/include/__filesystem/path.h +++ b/libcxx/include/__filesystem/path.h @@ -17,6 +17,7 @@ #include <__fwd/functional.h> #include <__iterator/back_insert_iterator.h> #include <__iterator/iterator_traits.h> +#include <__memory/addressof.h> #include <__type_traits/decay.h> #include <__type_traits/enable_if.h> #include <__type_traits/is_pointer.h> @@ -584,7 +585,7 @@ class _LIBCPP_EXPORTED_FROM_ABI path { template <class _ECharT, __enable_if_t<__can_convert_char<_ECharT>::value, int> = 0> _LIBCPP_HIDE_FROM_ABI path& operator+=(_ECharT __x) { - _PathCVT<_ECharT>::__append_source(__pn_, basic_string_view<_ECharT>(&__x, 1)); + _PathCVT<_ECharT>::__append_source(__pn_, basic_string_view<_ECharT>(std::addressof(__x), 1)); return *this; } diff --git a/libcxx/include/__functional/hash.h b/libcxx/include/__functional/hash.h index 28b2635ab1253..df654c8707fed 100644 --- a/libcxx/include/__functional/hash.h +++ b/libcxx/include/__functional/hash.h @@ -13,6 +13,7 @@ #include <__cstddef/nullptr_t.h> #include <__functional/unary_function.h> #include <__fwd/functional.h> +#include <__memory/addressof.h> #include <__type_traits/conjunction.h> #include <__type_traits/enable_if.h> #include <__type_traits/invoke.h> @@ -33,7 +34,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD template <class _Size> inline _LIBCPP_HIDE_FROM_ABI _Size __loadword(const void* __p) { _Size __r; - std::memcpy(&__r, __p, sizeof(__r)); + std::memcpy(std::addressof(__r), __p, sizeof(__r)); return __r; } @@ -276,7 +277,7 @@ struct __scalar_hash<_Tp, 2> : public __unary_function<_Tp, size_t> { } __s; } __u; __u.__t = __v; - return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u)); + return __murmur2_or_cityhash<size_t>()(std::addressof(__u), sizeof(__u)); } }; @@ -292,7 +293,7 @@ struct __scalar_hash<_Tp, 3> : public __unary_function<_Tp, size_t> { } __s; } __u; __u.__t = __v; - return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u)); + return __murmur2_or_cityhash<size_t>()(std::addressof(__u), sizeof(__u)); } }; @@ -309,7 +310,7 @@ struct __scalar_hash<_Tp, 4> : public __unary_function<_Tp, size_t> { } __s; } __u; __u.__t = __v; - return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u)); + return __murmur2_or_cityhash<size_t>()(std::addressof(__u), sizeof(__u)); } }; @@ -332,7 +333,7 @@ struct _LIBCPP_TEMPLATE_VIS hash<_Tp*> : public __unary_function<_Tp*, size_t> { size_t __a; } __u; __u.__t = __v; - return __murmur2_or_cityhash<size_t>()(&__u, sizeof(__u)); + return __murmur2_or_cityhash<size_t>()(std::addressof(__u), sizeof(__u)); } }; diff --git a/libcxx/include/__iterator/aliasing_iterator.h b/libcxx/include/__iterator/aliasing_iterator.h index e01127142ae98..3aa1f98bbf42a 100644 --- a/libcxx/include/__iterator/aliasing_iterator.h +++ b/libcxx/include/__iterator/aliasing_iterator.h @@ -102,7 +102,7 @@ struct __aliasing_iterator_wrapper { _LIBCPP_HIDE_FROM_ABI _Alias operator*() const _NOEXCEPT { _Alias __val; - __builtin_memcpy(&__val, std::__to_address(__base_), sizeof(value_type)); + __builtin_memcpy(std::addressof(__val), std::__to_address(__base_), sizeof(value_type)); return __val; } diff --git a/libcxx/include/__locale b/libcxx/include/__locale index dfe79d5e506f1..ad12df57ae359 100644 --- a/libcxx/include/__locale +++ b/libcxx/include/__locale @@ -12,6 +12,7 @@ #include <__config> #include <__locale_dir/locale_base_api.h> +#include <__memory/addressof.h> #include <__memory/shared_count.h> #include <__mutex/once_flag.h> #include <__type_traits/make_unsigned.h> @@ -156,7 +157,7 @@ locale locale::combine(const locale& __other) const { if (!std::has_facet<_Facet>(__other)) __throw_runtime_error("locale::combine: locale missing facet"); - return locale(*this, &const_cast<_Facet&>(std::use_facet<_Facet>(__other))); + return locale(*this, std::addressof(const_cast<_Facet&>(std::use_facet<_Facet>(__other)))); } template <class _Facet> diff --git a/libcxx/include/__mdspan/layout_left.h b/libcxx/include/__mdspan/layout_left.h index 288b3dd8038ee..2cb1f8548968e 100644 --- a/libcxx/include/__mdspan/layout_left.h +++ b/libcxx/include/__mdspan/layout_left.h @@ -58,7 +58,7 @@ class layout_left::mapping { index_type __prod = __ext.extent(0); for (rank_type __r = 1; __r < extents_type::rank(); __r++) { - bool __overflowed = __builtin_mul_overflow(__prod, __ext.extent(__r), &__prod); + bool __overflowed = __builtin_mul_overflow(__prod, __ext.extent(__r), std::addressof(__prod)); if (__overflowed) return false; } diff --git a/libcxx/include/__mdspan/layout_right.h b/libcxx/include/__mdspan/layout_right.h index 72922d1049c7a..4e5968803a446 100644 --- a/libcxx/include/__mdspan/layout_right.h +++ b/libcxx/include/__mdspan/layout_right.h @@ -58,7 +58,7 @@ class layout_right::mapping { index_type __prod = __ext.extent(0); for (rank_type __r = 1; __r < extents_type::rank(); __r++) { - bool __overflowed = __builtin_mul_overflow(__prod, __ext.extent(__r), &__prod); + bool __overflowed = __builtin_mul_overflow(__prod, __ext.extent(__r), std::addressof(__prod)); if (__overflowed) return false; } diff --git a/libcxx/include/__mdspan/layout_stride.h b/libcxx/include/__mdspan/layout_stride.h index bb93de9775145..a9cf836086e83 100644 --- a/libcxx/include/__mdspan/layout_stride.h +++ b/libcxx/include/__mdspan/layout_stride.h @@ -86,7 +86,7 @@ class layout_stride::mapping { index_type __prod = __ext.extent(0); for (rank_type __r = 1; __r < __rank_; __r++) { - bool __overflowed = __builtin_mul_overflow(__prod, __ext.extent(__r), &__prod); + bool __overflowed = __builtin_mul_overflow(__prod, __ext.extent(__r), std::addressof(__prod)); if (__overflowed) return false; } @@ -110,10 +110,11 @@ class layout_stride::mapping { if (__ext.extent(__r) == static_cast<index_type>(0)) return true; index_type __prod = (__ext.extent(__r) - 1); - bool __overflowed_mul = __builtin_mul_overflow(__prod, static_cast<index_type>(__strides[__r]), &__prod); + bool __overflowed_mul = + __builtin_mul_overflow(__prod, static_cast<index_type>(__strides[__r]), std::addressof(__prod)); if (__overflowed_mul) return false; - bool __overflowed_add = __builtin_add_overflow(__size, __prod, &__size); + bool __overflowed_add = __builtin_add_overflow(__size, __prod, std::addressof(__size)); if (__overflowed_add) return false; } diff --git a/libcxx/include/__mdspan/mdspan.h b/libcxx/include/__mdspan/mdspan.h index 3f9b35b185b16..fe7df50433147 100644 --- a/libcxx/include/__mdspan/mdspan.h +++ b/libcxx/include/__mdspan/mdspan.h @@ -215,7 +215,7 @@ class mdspan { _LIBCPP_ASSERT_UNCATEGORIZED( false == ([&]<size_t... _Idxs>(index_sequence<_Idxs...>) { size_type __prod = 1; - return (__builtin_mul_overflow(__prod, extent(_Idxs), &__prod) || ... || false); + return (__builtin_mul_overflow(__prod, extent(_Idxs), std::addressof(__prod)) || ... || false); }(make_index_sequence<rank()>())), "mdspan: size() is not representable as size_type"); return [&]<size_t... _Idxs>(index_sequence<_Idxs...>) { diff --git a/libcxx/include/__memory/shared_count.h b/libcxx/include/__memory/shared_count.h index 1438c6ba5a6d2..dad20bcabd7ea 100644 --- a/libcxx/include/__memory/shared_count.h +++ b/libcxx/include/__memory/shared_count.h @@ -10,6 +10,7 @@ #define _LIBCPP___MEMORY_SHARED_COUNT_H #include <__config> +#include <__memory/addressof.h> #include <typeinfo> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) @@ -52,7 +53,7 @@ inline _LIBCPP_HIDE_FROM_ABI _ValueType __libcpp_acquire_load(_ValueType const* template <class _Tp> inline _LIBCPP_HIDE_FROM_ABI _Tp __libcpp_atomic_refcount_increment(_Tp& __t) _NOEXCEPT { #if _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT && _LIBCPP_HAS_THREADS - return __atomic_add_fetch(&__t, 1, __ATOMIC_RELAXED); + return __atomic_add_fetch(std::addressof(__t), 1, __ATOMIC_RELAXED); #else return __t += 1; #endif @@ -61,7 +62,7 @@ inline _LIBCPP_HIDE_FROM_ABI _Tp __libcpp_atomic_refcount_increment(_Tp& __t) _N template <class _Tp> inline _LIBCPP_HIDE_FROM_ABI _Tp __libcpp_atomic_refcount_decrement(_Tp& __t) _NOEXCEPT { #if _LIBCPP_HAS_BUILTIN_ATOMIC_SUPPORT && _LIBCPP_HAS_THREADS - return __atomic_add_fetch(&__t, -1, __ATOMIC_ACQ_REL); + return __atomic_add_fetch(std::addressof(__t), -1, __ATOMIC_ACQ_REL); #else return __t -= 1; #endif diff --git a/libcxx/include/__ostream/basic_ostream.h b/libcxx/include/__ostream/basic_ostream.h index 97226476e5ef0..1262bc4cd89d5 100644 --- a/libcxx/include/__ostream/basic_ostream.h +++ b/libcxx/include/__ostream/basic_ostream.h @@ -15,6 +15,7 @@ # include <__exception/operations.h> # include <__fwd/memory.h> +# include <__memory/addressof.h> # include <__memory/unique_ptr.h> # include <__new/exceptions.h> # include <__ostream/put_character_sequence.h> @@ -339,7 +340,7 @@ basic_ostream<_CharT, _Traits>& basic_ostream<_CharT, _Traits>::operator<<(const template <class _CharT, class _Traits> _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_CharT, _Traits>& __os, _CharT __c) { - return std::__put_character_sequence(__os, &__c, 1); + return std::__put_character_sequence(__os, std::addressof(__c), 1); } template <class _CharT, class _Traits> @@ -353,9 +354,9 @@ _LIBCPP_HIDE_FROM_ABI basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_ typedef ostreambuf_iterator<_CharT, _Traits> _Ip; if (std::__pad_and_output( _Ip(__os), - &__c, - (__os.flags() & ios_base::adjustfield) == ios_base::left ? &__c + 1 : &__c, - &__c + 1, + std::addressof(__c), + std::addressof(__c) + (__os.flags() & ios_base::adjustfield) == ios_base::left, + std::addressof(__c) + 1, __os, __os.fill()) .failed()) diff --git a/libcxx/include/__split_buffer b/libcxx/include/__split_buffer index a8f679cc30a9c..721d4d497f2a5 100644 --- a/libcxx/include/__split_buffer +++ b/libcxx/include/__split_buffer @@ -233,7 +233,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 bool __split_buffer<_Tp, _Allocator>::__invariants // Postcondition: size() == size() + __n template <class _Tp, class _Allocator> _LIBCPP_CONSTEXPR_SINCE_CXX20 void __split_buffer<_Tp, _Allocator>::__construct_at_end(size_type __n) { - _ConstructTransaction __tx(&this->__end_, __n); + _ConstructTransaction __tx(std::addressof(this->__end_), __n); for (; __tx.__pos_ != __tx.__end_; ++__tx.__pos_) { __alloc_traits::construct(__alloc_, std::__to_address(__tx.__pos_)); } @@ -248,7 +248,7 @@ _LIBCPP_CONSTEXPR_SINCE_CXX20 void __split_buffer<_Tp, _Allocator>::__construct_ template <class _Tp, class _Allocator> _LIBCPP_CONSTEXPR_SINCE_CXX20 void __split_buffer<_Tp, _Allocator>::__construct_at_end(size_type __n, const_reference __x) { - _ConstructTransaction __tx(&this->__end_, __n); + _ConstructTransaction __tx(std::addressof(this->__end_), __n); for (; __tx.__pos_ != __tx.__end_; ++__tx.__pos_) { __alloc_traits::construct(__alloc_, std::__to_address(__tx.__pos_), __x); } @@ -283,7 +283,7 @@ template <class _Tp, class _Allocator> template <class _ForwardIterator> _LIBCPP_CONSTEXPR_SINCE_CXX20 void __split_buffer<_Tp, _Allocator>::__construct_at_end_with_size(_ForwardIterator __first, size_type __n) { - _ConstructTransaction __tx(&this->__end_, __n); + _ConstructTransaction __tx(std::addressof(this->__end_), __n); for (; __tx.__pos_ != __tx.__end_; ++__tx.__pos_, (void)++__first) { __alloc_traits::construct(__alloc_, std::__to_address(__tx.__pos_), *__first); } diff --git a/libcxx/include/__stop_token/intrusive_shared_ptr.h b/libcxx/include/__stop_token/intrusive_shared_ptr.h index d20c5227ec729..0d5ffe0647166 100644 --- a/libcxx/include/__stop_token/intrusive_shared_ptr.h +++ b/libcxx/include/__stop_token/intrusive_shared_ptr.h @@ -14,6 +14,7 @@ #include <__atomic/memory_order.h> #include <__config> #include <__cstddef/nullptr_t.h> +#include <__memory/addressof.h> #include <__type_traits/is_reference.h> #include <__utility/move.h> #include <__utility/swap.h> @@ -113,7 +114,7 @@ struct __intrusive_shared_ptr { _LIBCPP_HIDE_FROM_ABI static void __decrement_ref_count(_Tp& __obj) { if (__get_atomic_ref_count(__obj).fetch_sub(1, std::memory_order_acq_rel) == 1) { - delete &__obj; + delete std::addressof(__obj); } } diff --git a/libcxx/include/__string/constexpr_c_functions.h b/libcxx/include/__string/constexpr_c_functions.h index fbe7e10d440ce..119669e16bbcf 100644 --- a/libcxx/include/__string/constexpr_c_functions.h +++ b/libcxx/include/__string/constexpr_c_functions.h @@ -146,7 +146,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp* __constexpr_memchr(_Tp* return nullptr; } else { char __value_buffer = 0; - __builtin_memcpy(&__value_buffer, &__value, sizeof(char)); + __builtin_memcpy(&__value_buffer, std::addressof(__value), sizeof(char)); return static_cast<_Tp*>(__builtin_memchr(__str, __value_buffer, __count)); } } diff --git a/libcxx/include/__thread/thread.h b/libcxx/include/__thread/thread.h index c40ffd25b903c..cc4b64f757e46 100644 --- a/libcxx/include/__thread/thread.h +++ b/libcxx/include/__thread/thread.h @@ -16,6 +16,7 @@ #include <__exception/terminate.h> #include <__functional/hash.h> #include <__functional/unary_function.h> +#include <__memory/addressof.h> #include <__memory/unique_ptr.h> #include <__mutex/mutex.h> #include <__system_error/throw_system_error.h> @@ -215,7 +216,7 @@ thread::thread(_Fp&& __f, _Args&&... __args) { _TSPtr __tsp(new __thread_struct); typedef tuple<_TSPtr, __decay_t<_Fp>, __decay_t<_Args>...> _Gp; unique_ptr<_Gp> __p(new _Gp(std::move(__tsp), std::forward<_Fp>(__f), std::forward<_Args>(__args)...)); - int __ec = std::__libcpp_thread_create(&__t_, &__thread_proxy<_Gp>, __p.get()); + int __ec = std::__libcpp_thread_create(&__t_, std::addressof(__thread_proxy<_Gp>), __p.get()); if (__ec == 0) __p.release(); else diff --git a/libcxx/include/cwchar b/libcxx/include/cwchar index 4a4b052831a9a..8b940b887d25f 100644 --- a/libcxx/include/cwchar +++ b/libcxx/include/cwchar @@ -107,6 +107,7 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len, #else # include <__config> # include <__cstddef/size_t.h> +# include <__memory/addressof.h> # include <__type_traits/copy_cv.h> # include <__type_traits/is_constant_evaluated.h> # include <__type_traits/is_equality_comparable.h> @@ -237,7 +238,7 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp* __constexpr_wmemchr(_Tp # if __has_builtin(__builtin_wmemchr) if (!__libcpp_is_constant_evaluated()) { wchar_t __value_buffer = 0; - __builtin_memcpy(&__value_buffer, &__value, sizeof(wchar_t)); + __builtin_memcpy(&__value_buffer, std::addressof(__value), sizeof(wchar_t)); return reinterpret_cast<_Tp*>( __builtin_wmemchr(reinterpret_cast<__copy_cv_t<_Tp, wchar_t>*>(__str), __value_buffer, __count)); } diff --git a/libcxx/include/fstream b/libcxx/include/fstream index de5c07035dba9..5ac2be8110bf5 100644 --- a/libcxx/include/fstream +++ b/libcxx/include/fstream @@ -420,7 +420,7 @@ basic_filebuf<_CharT, _Traits>::basic_filebuf() __owns_ib_(false), __always_noconv_(false) { if (std::has_facet<codecvt<char_type, char, state_type> >(this->getloc())) { - __cv_ = &std::use_facet<codecvt<char_type, char, state_type> >(this->getloc()); + __cv_ = std::addressof(std::use_facet<codecvt<char_type, char, state_type> >(this->getloc())); __always_noconv_ = __cv_->always_noconv(); } setbuf(nullptr, 4096); @@ -753,7 +753,7 @@ typename basic_filebuf<_CharT, _Traits>::int_type basic_filebuf<_CharT, _Traits> bool __initial = __read_mode(); char_type __1buf; if (this->gptr() == nullptr) - this->setg(&__1buf, &__1buf + 1, &__1buf + 1); + this->setg(std::addressof(__1buf), std::addressof(__1buf) + 1, std::addressof(__1buf) + 1); const size_t __unget_sz = __initial ? 0 : std::min<size_t>((this->egptr() - this->eback()) / 2, 4); int_type __c = traits_type::eof(); if (this->gptr() == this->egptr()) { @@ -797,7 +797,7 @@ typename basic_filebuf<_CharT, _Traits>::int_type basic_filebuf<_CharT, _Traits> } } else __c = traits_type::to_int_type(*this->gptr()); - if (this->eback() == &__1buf) + if (this->eback() == std::addressof(__1buf)) this->setg(nullptr, nullptr, nullptr); return __c; } @@ -828,7 +828,7 @@ typename basic_filebuf<_CharT, _Traits>::int_type basic_filebuf<_CharT, _Traits> char_type* __epb_save = this->epptr(); if (!traits_type::eq_int_type(__c, traits_type::eof())) { if (this->pptr() == nullptr) - this->setp(&__1buf, &__1buf + 1); + this->setp(std::addressof(__1buf), std::addressof(__1buf) + 1); *this->pptr() = traits_type::to_char_type(__c); this->pbump(1); } @@ -1029,7 +1029,7 @@ int basic_filebuf<_CharT, _Traits>::sync() { template <class _CharT, class _Traits> void basic_filebuf<_CharT, _Traits>::imbue(const locale& __loc) { sync(); - __cv_ = &std::use_facet<codecvt<char_type, char, state_type> >(__loc); + __cv_ = std::addressof(std::use_facet<codecvt<char_type, char, state_type> >(__loc)); bool __old_anc = __always_noconv_; __always_noconv_ = __cv_->always_noconv(); if (__old_anc != __always_noconv_) { diff --git a/libcx... [truncated] `````````` </details> https://github.com/llvm/llvm-project/pull/128351 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
