diff options
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/array | 3 | ||||
| -rw-r--r-- | libcxx/test/containers/sequences/array/array.tuple/get.fail.cpp | 25 |
2 files changed, 28 insertions, 0 deletions
diff --git a/libcxx/include/array b/libcxx/include/array index 029bfd00a5c..f4a3020aeae 100644 --- a/libcxx/include/array +++ b/libcxx/include/array @@ -310,6 +310,7 @@ _LIBCPP_INLINE_VISIBILITY inline _Tp& get(array<_Tp, _Size>& __a) _NOEXCEPT { + static_assert(_Ip < _Size, "Index out of bounds in std::get<> (std::array)"); return __a[_Ip]; } @@ -318,6 +319,7 @@ _LIBCPP_INLINE_VISIBILITY inline const _Tp& get(const array<_Tp, _Size>& __a) _NOEXCEPT { + static_assert(_Ip < _Size, "Index out of bounds in std::get<> (const std::array)"); return __a[_Ip]; } @@ -328,6 +330,7 @@ _LIBCPP_INLINE_VISIBILITY inline _Tp&& get(array<_Tp, _Size>&& __a) _NOEXCEPT { + static_assert(_Ip < _Size, "Index out of bounds in std::get<> (std::array &&)"); return _VSTD::move(__a[_Ip]); } diff --git a/libcxx/test/containers/sequences/array/array.tuple/get.fail.cpp b/libcxx/test/containers/sequences/array/array.tuple/get.fail.cpp new file mode 100644 index 00000000000..26aa5c74190 --- /dev/null +++ b/libcxx/test/containers/sequences/array/array.tuple/get.fail.cpp @@ -0,0 +1,25 @@ +//===----------------------------------------------------------------------===// +// +// 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> + +// template <size_t I, class T, size_t N> T& get(array<T, N>& a); + +#include <array> +#include <cassert> + +int main() +{ + { + typedef double T; + typedef std::array<T, 3> C; + C c = {1, 2, 3.5}; + std::get<3>(c) = 5.5; // Can't get element 3! + } +} |
