[v3] libstdc++/53080
Paolo Carlini
paolo.carlini@oracle.com
Mon Apr 23 11:25:00 GMT 2012
Hi,
this is what I'm about to commit, pretty straightforward. Tested
x86_64-linux.
Thanks,
Paolo.
///////////////////////////
-------------- next part --------------
2012-04-23 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/53080
* include/std/array (tuple_element, get): static_assert I < N.
* testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc:
New.
* testsuite/23_containers/array/tuple_interface/get_neg.cc: Likewise.
* testsuite/23_containers/array/tuple_interface/tuple_element.cc: Fix.
-------------- next part --------------
Index: include/std/array
===================================================================
--- include/std/array (revision 186692)
+++ include/std/array (working copy)
@@ -1,6 +1,7 @@
// <array> -*- C++ -*-
-// Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+// Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012
+// Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -261,23 +262,35 @@
class tuple_element;
template<std::size_t _Int, typename _Tp, std::size_t _Nm>
- struct tuple_element<_Int, array<_Tp, _Nm> >
- { typedef _Tp type; };
+ struct tuple_element<_Int, array<_Tp, _Nm>>
+ {
+ static_assert(_Int < _Nm, "index is out of bounds");
+ typedef _Tp type;
+ };
template<std::size_t _Int, typename _Tp, std::size_t _Nm>
constexpr _Tp&
get(array<_Tp, _Nm>& __arr) noexcept
- { return __arr._M_instance[_Int]; }
+ {
+ static_assert(_Int < _Nm, "index is out of bounds");
+ return __arr._M_instance[_Int];
+ }
template<std::size_t _Int, typename _Tp, std::size_t _Nm>
constexpr _Tp&&
get(array<_Tp, _Nm>&& __arr) noexcept
- { return std::move(get<_Int>(__arr)); }
+ {
+ static_assert(_Int < _Nm, "index is out of bounds");
+ return std::move(get<_Int>(__arr));
+ }
template<std::size_t _Int, typename _Tp, std::size_t _Nm>
constexpr const _Tp&
get(const array<_Tp, _Nm>& __arr) noexcept
- { return __arr._M_instance[_Int]; }
+ {
+ static_assert(_Int < _Nm, "index is out of bounds");
+ return __arr._M_instance[_Int];
+ }
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace
Index: testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc
===================================================================
--- testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc (revision 0)
+++ testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc (revision 0)
@@ -0,0 +1,25 @@
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2012 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <array>
+
+typedef std::tuple_element<1, std::array<int, 1>>::type type;
+
+// { dg-error "static assertion failed" "" { target *-*-* } 267 }
Index: testsuite/23_containers/array/tuple_interface/tuple_element.cc
===================================================================
--- testsuite/23_containers/array/tuple_interface/tuple_element.cc (revision 186692)
+++ testsuite/23_containers/array/tuple_interface/tuple_element.cc (working copy)
@@ -1,6 +1,6 @@
// { dg-options "-std=gnu++0x" }
//
-// Copyright (C) 2011 Free Software Foundation, Inc.
+// Copyright (C) 2011, 2012 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
@@ -27,19 +27,11 @@
bool test __attribute__((unused)) = true;
using namespace std;
- {
- const size_t len = 3;
- typedef array<int, len> array_type;
- VERIFY( (is_same<tuple_element<0, array_type>::type, int>::value == true) );
- VERIFY( (is_same<tuple_element<1, array_type>::type, int>::value == true) );
- VERIFY( (is_same<tuple_element<2, array_type>::type, int>::value == true) );
- }
-
- {
- const size_t len = 0;
- typedef array<int, len> array_type;
- VERIFY( (is_same<tuple_element<0, array_type>::type, int>::value == true) );
- }
+ const size_t len = 3;
+ typedef array<int, len> array_type;
+ VERIFY( (is_same<tuple_element<0, array_type>::type, int>::value == true) );
+ VERIFY( (is_same<tuple_element<1, array_type>::type, int>::value == true) );
+ VERIFY( (is_same<tuple_element<2, array_type>::type, int>::value == true) );
}
int main()
Index: testsuite/23_containers/array/tuple_interface/get_neg.cc
===================================================================
--- testsuite/23_containers/array/tuple_interface/get_neg.cc (revision 0)
+++ testsuite/23_containers/array/tuple_interface/get_neg.cc (revision 0)
@@ -0,0 +1,32 @@
+// { dg-options "-std=gnu++11" }
+// { dg-do compile }
+
+// Copyright (C) 2012 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3. If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <array>
+
+std::array<int, 1> a{};
+const std::array<int, 1> ca{};
+
+int n1 = std::get<1>(a);
+int n2 = std::get<1>(std::move(a));
+int n3 = std::get<1>(ca);
+
+// { dg-error "static assertion failed" "" { target *-*-* } 275 }
+// { dg-error "static assertion failed" "" { target *-*-* } 283 }
+// { dg-error "static assertion failed" "" { target *-*-* } 291 }
More information about the Libstdc++
mailing list