From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1930) id 3EAA7385B80B; Wed, 2 Feb 2022 00:22:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3EAA7385B80B MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Sebor To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-6992] Declare std::array members with attribute const [PR101831]. X-Act-Checkin: gcc X-Git-Author: Martin Sebor X-Git-Refname: refs/heads/master X-Git-Oldrev: 07a6c52c4cd145d20488c4823669a2d984ba2051 X-Git-Newrev: 756eabacfcd767e39eea63257a026f61a4c4e661 Message-Id: <20220202002210.3EAA7385B80B@sourceware.org> Date: Wed, 2 Feb 2022 00:22:10 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Feb 2022 00:22:10 -0000 https://gcc.gnu.org/g:756eabacfcd767e39eea63257a026f61a4c4e661 commit r12-6992-g756eabacfcd767e39eea63257a026f61a4c4e661 Author: Martin Sebor Date: Tue Feb 1 17:19:11 2022 -0700 Declare std::array members with attribute const [PR101831]. Resolves: PR libstdc++/101831 - Spurious maybe-uninitialized warning on std::array::size libstdc++-v3/ChangeLog: PR libstdc++/101831 * include/std/array (begin): Declare const member function attribute const. (end, rbegin, rend, size, max_size, empty, data): Same. * testsuite/23_containers/array/capacity/empty.cc: Add test cases. * testsuite/23_containers/array/capacity/max_size.cc: Same. * testsuite/23_containers/array/capacity/size.cc: Same. * testsuite/23_containers/array/iterators/begin_end.cc: New test. Diff: --- libstdc++-v3/include/std/array | 16 ++++----- .../23_containers/array/capacity/empty.cc | 18 ++++++++++ .../23_containers/array/capacity/max_size.cc | 18 ++++++++++ .../testsuite/23_containers/array/capacity/size.cc | 18 ++++++++++ .../23_containers/array/iterators/begin_end.cc | 39 ++++++++++++++++++++++ 5 files changed, 101 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array index b4d8fc81a52..e45143fb329 100644 --- a/libstdc++-v3/include/std/array +++ b/libstdc++-v3/include/std/array @@ -127,7 +127,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { std::swap_ranges(begin(), end(), __other.begin()); } // Iterators. - [[__nodiscard__]] + [[__gnu__::__const__, __nodiscard__]] _GLIBCXX17_CONSTEXPR iterator begin() noexcept { return iterator(data()); } @@ -137,7 +137,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION begin() const noexcept { return const_iterator(data()); } - [[__nodiscard__]] + [[__gnu__::__const__, __nodiscard__]] _GLIBCXX17_CONSTEXPR iterator end() noexcept { return iterator(data() + _Nm); } @@ -147,7 +147,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION end() const noexcept { return const_iterator(data() + _Nm); } - [[__nodiscard__]] + [[__gnu__::__const__, __nodiscard__]] _GLIBCXX17_CONSTEXPR reverse_iterator rbegin() noexcept { return reverse_iterator(end()); } @@ -157,7 +157,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION rbegin() const noexcept { return const_reverse_iterator(end()); } - [[__nodiscard__]] + [[__gnu__::__const__, __nodiscard__]] _GLIBCXX17_CONSTEXPR reverse_iterator rend() noexcept { return reverse_iterator(begin()); } @@ -188,15 +188,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { return const_reverse_iterator(begin()); } // Capacity. - [[__nodiscard__]] + [[__gnu__::__const__, __nodiscard__]] constexpr size_type size() const noexcept { return _Nm; } - [[__nodiscard__]] + [[__gnu__::__const__, __nodiscard__]] constexpr size_type max_size() const noexcept { return _Nm; } - [[__nodiscard__]] + [[__gnu__::__const__, __nodiscard__]] constexpr bool empty() const noexcept { return size() == 0; } @@ -278,7 +278,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION : _AT_Type::_S_ref(_M_elems, 0); } - [[__nodiscard__]] + [[__gnu__::__const__, __nodiscard__]] _GLIBCXX17_CONSTEXPR pointer data() noexcept { return _AT_Type::_S_ptr(_M_elems); } diff --git a/libstdc++-v3/testsuite/23_containers/array/capacity/empty.cc b/libstdc++-v3/testsuite/23_containers/array/capacity/empty.cc index 3f3f282ad9d..cecbae39e45 100644 --- a/libstdc++-v3/testsuite/23_containers/array/capacity/empty.cc +++ b/libstdc++-v3/testsuite/23_containers/array/capacity/empty.cc @@ -40,8 +40,26 @@ test01() } } +#pragma GCC push_options +#pragma GCC optimize "0" + +void +test02() +{ + { + const size_t len = 3; + typedef std::array array_type; + array_type a; + + VERIFY( a.empty() == false ); // { dg-bogus "-Wmaybe-uninitialized" + } +} + +#pragma GCC pop_options + int main() { test01(); + test02(); return 0; } diff --git a/libstdc++-v3/testsuite/23_containers/array/capacity/max_size.cc b/libstdc++-v3/testsuite/23_containers/array/capacity/max_size.cc index 0e000258530..4629316161d 100644 --- a/libstdc++-v3/testsuite/23_containers/array/capacity/max_size.cc +++ b/libstdc++-v3/testsuite/23_containers/array/capacity/max_size.cc @@ -40,8 +40,26 @@ test01() } } +#pragma GCC push_options +#pragma GCC optimize "0" + +void +test02() +{ + { + const size_t len = 3; + typedef std::array array_type; + array_type a; + + VERIFY( a.max_size() == len ); // { dg-bogus "-Wmaybe-uninitialized" + } +} + +#pragma GCC pop_options + int main() { test01(); + test02(); return 0; } diff --git a/libstdc++-v3/testsuite/23_containers/array/capacity/size.cc b/libstdc++-v3/testsuite/23_containers/array/capacity/size.cc index 3e4aa7143dc..dddd909a0ac 100644 --- a/libstdc++-v3/testsuite/23_containers/array/capacity/size.cc +++ b/libstdc++-v3/testsuite/23_containers/array/capacity/size.cc @@ -40,8 +40,26 @@ test01() } } +#pragma GCC push_options +#pragma GCC optimize "0" + +void +test02() +{ + { + const size_t len = 3; + typedef std::array array_type; + array_type a; + + VERIFY( a.size() == len ); // { dg-bogus "-Wmaybe-uninitialized" + } +} + +#pragma GCC pop_options + int main() { test01(); + test02(); return 0; } diff --git a/libstdc++-v3/testsuite/23_containers/array/iterators/begin_end.cc b/libstdc++-v3/testsuite/23_containers/array/iterators/begin_end.cc new file mode 100644 index 00000000000..69594a1fc74 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/array/iterators/begin_end.cc @@ -0,0 +1,39 @@ +// { dg-do compile { target c++11 } } + +#include + +#pragma GCC push_options +#pragma GCC optimize "0" + +extern void +sink (const void*, ...); + +void +test01() +{ + { + const std::size_t len = 1; + typedef std::array array_type; + typedef array_type::iterator iterator;; + array_type a; + + iterator b = a.begin(); // { dg-bogus "-Wmaybe-uninitialized" } + iterator e = a.end(); // { dg-bogus "-Wmaybe-uninitialized" } + + sink(&b, &e); + } + + { + const std::size_t len = 3; + typedef std::array array_type; + typedef array_type::reverse_iterator reverse_iterator; + array_type a; + + reverse_iterator b = a.rbegin(); // { dg-bogus "-Wmaybe-uninitialized" } + reverse_iterator e = a.rend(); // { dg-bogus "-Wmaybe-uninitialized" } + + sink(&b, &e); + } +} + +#pragma GCC pop_options