diff options
| -rw-r--r-- | libcxx/include/array | 1 | ||||
| -rw-r--r-- | libcxx/test/std/containers/sequences/array/array.tuple/tuple_element.fail.cpp | 35 |
2 files changed, 36 insertions, 0 deletions
diff --git a/libcxx/include/array b/libcxx/include/array index 79f7e0d62c5..12780992e5c 100644 --- a/libcxx/include/array +++ b/libcxx/include/array @@ -296,6 +296,7 @@ class _LIBCPP_TEMPLATE_VIS tuple_size<array<_Tp, _Size> > template <size_t _Ip, class _Tp, size_t _Size> class _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, array<_Tp, _Size> > { + static_assert(_Ip < _Size, "Index out of bounds in std::tuple_element<> (std::array)"); public: typedef _Tp type; }; diff --git a/libcxx/test/std/containers/sequences/array/array.tuple/tuple_element.fail.cpp b/libcxx/test/std/containers/sequences/array/array.tuple/tuple_element.fail.cpp new file mode 100644 index 00000000000..c9fe695f9cb --- /dev/null +++ b/libcxx/test/std/containers/sequences/array/array.tuple/tuple_element.fail.cpp @@ -0,0 +1,35 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// <array> + +// tuple_element<I, array<T, N> >::type + +// Prevent -Warray-bounds from issuing a diagnostic when testing with clang verify. +#if defined(__clang__) +#pragma clang diagnostic ignored "-Warray-bounds" +#endif + +#include <array> +#include <cassert> + + +// std::array is explicitly allowed to be initialized with A a = { init-list };. +// Disable the missing braces warning for this reason. +#include "disable_missing_braces_warning.h" + +int main() +{ + { + typedef double T; + typedef std::array<T, 3> C; + std::tuple_element<3, C> foo; // expected-note {{requested here}} + // expected-error@array:* {{static_assert failed "Index out of bounds in std::tuple_element<> (std::array)"}} + } +} |
