Add noexcept to operator[] for array and deque. This is an extension. We already do this for string and string_view. This should give better codegen inside of noexcept functions.
llvm-svn: 356209
diff --git a/libcxx/test/std/containers/sequences/array/indexing.pass.cpp b/libcxx/test/std/containers/sequences/array/indexing.pass.cpp
index bf55711..7bc3360 100644
--- a/libcxx/test/std/containers/sequences/array/indexing.pass.cpp
+++ b/libcxx/test/std/containers/sequences/array/indexing.pass.cpp
@@ -12,6 +12,7 @@
// const_reference operator[] (size_type); // constexpr in C++14
// reference at (size_type)
// const_reference at (size_type); // constexpr in C++14
+// Libc++ marks these as noexcept
#include <array>
#include <cassert>
@@ -36,6 +37,8 @@
typedef double T;
typedef std::array<T, 3> C;
C c = {1, 2, 3.5};
+ LIBCPP_ASSERT_NOEXCEPT(c[0]);
+ ASSERT_SAME_TYPE(C::reference, decltype(c[0]));
C::reference r1 = c[0];
assert(r1 == 1);
r1 = 5.5;
@@ -50,6 +53,8 @@
typedef double T;
typedef std::array<T, 3> C;
const C c = {1, 2, 3.5};
+ LIBCPP_ASSERT_NOEXCEPT(c[0]);
+ ASSERT_SAME_TYPE(C::const_reference, decltype(c[0]));
C::const_reference r1 = c[0];
assert(r1 == 1);
C::const_reference r2 = c[2];
@@ -59,6 +64,8 @@
typedef double T;
typedef std::array<T, 0> C;
C c = {};
+ LIBCPP_ASSERT_NOEXCEPT(c[0]);
+ ASSERT_SAME_TYPE(C::reference, decltype(c[0]));
C const& cc = c;
static_assert((std::is_same<decltype(c[0]), T &>::value), "");
static_assert((std::is_same<decltype(cc[0]), const T &>::value), "");
@@ -73,6 +80,8 @@
typedef double T;
typedef std::array<const T, 0> C;
C c = {{}};
+ LIBCPP_ASSERT_NOEXCEPT(c[0]);
+ ASSERT_SAME_TYPE(C::reference, decltype(c[0]));
C const& cc = c;
static_assert((std::is_same<decltype(c[0]), const T &>::value), "");
static_assert((std::is_same<decltype(cc[0]), const T &>::value), "");
@@ -88,6 +97,8 @@
typedef double T;
typedef std::array<T, 3> C;
constexpr C c = {1, 2, 3.5};
+ LIBCPP_ASSERT_NOEXCEPT(c[0]);
+ ASSERT_SAME_TYPE(C::const_reference, decltype(c[0]));
constexpr T t1 = c[0];
static_assert (t1 == 1, "");
diff --git a/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
index 86c5184..c7d9006 100644
--- a/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
+++ b/libcxx/test/std/containers/sequences/deque/deque.capacity/access.pass.cpp
@@ -19,11 +19,13 @@
//
// reference back();
// const_reference back() const;
+// libc++ marks these as 'noexcept'
#include <deque>
#include <cassert>
#include "min_allocator.h"
+#include "test_macros.h"
template <class C>
C
@@ -50,7 +52,10 @@
int main(int, char**)
{
{
- std::deque<int> c = make<std::deque<int> >(10);
+ typedef std::deque<int> C;
+ C c = make<std::deque<int> >(10);
+ LIBCPP_ASSERT_NOEXCEPT(c[0]);
+ ASSERT_SAME_TYPE(C::reference, decltype(c[0]));
for (int i = 0; i < 10; ++i)
assert(c[i] == i);
for (int i = 0; i < 10; ++i)
@@ -59,7 +64,10 @@
assert(c.back() == 9);
}
{
- const std::deque<int> c = make<std::deque<int> >(10);
+ typedef std::deque<int> C;
+ const C c = make<std::deque<int> >(10);
+ LIBCPP_ASSERT_NOEXCEPT(c[0]);
+ ASSERT_SAME_TYPE(C::const_reference, decltype(c[0]));
for (int i = 0; i < 10; ++i)
assert(c[i] == i);
for (int i = 0; i < 10; ++i)
@@ -69,7 +77,10 @@
}
#if TEST_STD_VER >= 11
{
- std::deque<int, min_allocator<int>> c = make<std::deque<int, min_allocator<int>> >(10);
+ typedef std::deque<int, min_allocator<int>> C;
+ C c = make<std::deque<int, min_allocator<int>> >(10);
+ LIBCPP_ASSERT_NOEXCEPT(c[0]);
+ ASSERT_SAME_TYPE(C::reference, decltype(c[0]));
for (int i = 0; i < 10; ++i)
assert(c[i] == i);
for (int i = 0; i < 10; ++i)
@@ -78,7 +89,10 @@
assert(c.back() == 9);
}
{
- const std::deque<int, min_allocator<int>> c = make<std::deque<int, min_allocator<int>> >(10);
+ typedef std::deque<int, min_allocator<int>> C;
+ const C c = make<std::deque<int, min_allocator<int>> >(10);
+ LIBCPP_ASSERT_NOEXCEPT(c[0]);
+ ASSERT_SAME_TYPE(C::const_reference, decltype(c[0]));
for (int i = 0; i < 10; ++i)
assert(c[i] == i);
for (int i = 0; i < 10; ++i)