diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2023-06-06 11:38:42 +0100 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2023-06-06 12:43:47 +0100 |
commit | 56001fad4ecc32396beead6644906e3846244b67 (patch) | |
tree | 3f5fc92417f76f7e45107c683afd8d0a204ac8df /libstdc++-v3/include/std/array | |
parent | 3d9b3ddb5fc9087c17645d53e6bcb1881e1955a4 (diff) | |
download | gcc-56001fad4ecc32396beead6644906e3846244b67.zip gcc-56001fad4ecc32396beead6644906e3846244b67.tar.gz gcc-56001fad4ecc32396beead6644906e3846244b67.tar.bz2 |
libstdc++: Fix ambiguous expression in std::array<T, 0>::front() [PR110139]
For 32-bit targets using -pedantic (or using Clang) makes the expression
_M_elems[0] ambiguous. The overloaded operator[] that we want to call
has a size_t parameter, but 0 is type ptrdiff_t for many ILP32 targets,
so using the implicit conversion from _M_elems to T* and then
subscripting that is also viable.
Change the 0 to (size_type)0 and also make the conversion to T*
explicit, so that's it's not viable here. The latter change requires a
static_cast in data() where we really do want to convert _M_elems to a
pointer.
libstdc++-v3/ChangeLog:
PR libstdc++/110139
* include/std/array (__array_traits<T, 0>::operator T*()): Make
conversion operator explicit.
(array::front): Use size_type as subscript operand.
(array::data): Use static_cast to make conversion explicit.
* testsuite/23_containers/array/element_access/110139.cc: New
test.
Diffstat (limited to 'libstdc++-v3/include/std/array')
-rw-r--r-- | libstdc++-v3/include/std/array | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array index 27354d9..70280c1 100644 --- a/libstdc++-v3/include/std/array +++ b/libstdc++-v3/include/std/array @@ -69,7 +69,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Conversion to a pointer produces a null pointer. __attribute__((__always_inline__)) - constexpr operator _Tp*() const noexcept { return nullptr; } + constexpr explicit operator _Tp*() const noexcept { return nullptr; } }; using _Is_swappable = true_type; @@ -240,7 +240,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION front() noexcept { __glibcxx_requires_nonempty(); - return _M_elems[0]; + return _M_elems[(size_type)0]; } [[__nodiscard__]] @@ -250,7 +250,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cplusplus >= 201402L __glibcxx_requires_nonempty(); #endif - return _M_elems[0]; + return _M_elems[(size_type)0]; } [[__nodiscard__]] @@ -274,12 +274,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION [[__nodiscard__, __gnu__::__const__, __gnu__::__always_inline__]] _GLIBCXX17_CONSTEXPR pointer data() noexcept - { return _M_elems; } + { return static_cast<pointer>(_M_elems); } [[__nodiscard__]] _GLIBCXX17_CONSTEXPR const_pointer data() const noexcept - { return _M_elems; } + { return static_cast<const_pointer>(_M_elems); } }; #if __cpp_deduction_guides >= 201606 |