From 8a02f8d92801e040efecd595be9d2f2dcfaca164 Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Mon, 29 Apr 2019 15:38:07 +0000 Subject: [PATCH] Add tests specifically for LWG2164. We already did this; but now we have tests. NFC llvm-svn: 359458 --- .../vector/vector.modifiers/emplace_back.pass.cpp | 11 +++++++++++ .../vector/vector.modifiers/pop_back.pass.cpp | 12 ++++++++++++ libcxx/www/cxx2a_status.html | 2 +- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/libcxx/test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp index 435be207bb44..aacdb388595b 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.modifiers/emplace_back.pass.cpp @@ -145,5 +145,16 @@ int main(int, char**) assert(is_contiguous_container_asan_correct(c)); } + { // LWG 2164 + int arr[] = {0, 1, 2, 3, 4}; + int sz = 5; + std::vector c(arr, arr+sz); + while (c.size() < c.capacity()) + c.push_back(sz++); + c.emplace_back(c.front()); + assert(c.back() == 0); + for (int i = 0; i < sz; ++i) + assert(c[i] == i); + } return 0; } diff --git a/libcxx/test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp index db2337c276ec..386328405d01 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp @@ -38,5 +38,17 @@ int main(int, char**) } #endif + { // LWG 526 + int arr[] = {0, 1, 2, 3, 4}; + int sz = 5; + std::vector c(arr, arr+sz); + while (c.size() < c.capacity()) + c.push_back(sz++); + c.push_back(c.front()); + assert(c.back() == 0); + for (int i = 0; i < sz; ++i) + assert(c[i] == i); + } + return 0; } diff --git a/libcxx/www/cxx2a_status.html b/libcxx/www/cxx2a_status.html index d8b03427c338..f4461f57d508 100644 --- a/libcxx/www/cxx2a_status.html +++ b/libcxx/www/cxx2a_status.html @@ -216,7 +216,7 @@ 3024variant's copies must be deleted instead of disabled via SFINAEAlbuquerque - 2164What are the semantics of vector.emplace(vector.begin(), vector.back())?Jacksonville + 2164What are the semantics of vector.emplace(vector.begin(), vector.back())?JacksonvilleComplete 2243istream::putback problemJacksonvilleComplete 2816resize_file has impossible postconditionJacksonvilleNothing to do 2843Unclear behavior of std::pmr::memory_resource::do_allocate()JacksonvilleComplete