From 782da33d1c5b54d1be8db9b4d90cbeedc8d5d72d Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Mon, 25 Mar 2013 22:12:26 +0000 Subject: [PATCH] Added debug tests for indexing, pop_back and both forms of erase. Added an improved error message for erasing a single element with end(). git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@177929 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/vector | 2 + .../sequences/vector/db_cindex.pass.cpp | 46 ++++++++++++++++++ .../sequences/vector/db_index.pass.cpp | 47 ++++++++++++++++++ .../vector.modifiers/erase_iter_db1.pass.cpp | 44 +++++++++++++++++ .../vector.modifiers/erase_iter_db2.pass.cpp | 45 +++++++++++++++++ .../erase_iter_iter_db1.pass.cpp | 44 +++++++++++++++++ .../erase_iter_iter_db2.pass.cpp | 44 +++++++++++++++++ .../erase_iter_iter_db3.pass.cpp | 44 +++++++++++++++++ .../erase_iter_iter_db4.pass.cpp | 43 +++++++++++++++++ .../vector/vector.modifiers/pop_back.pass.cpp | 48 +++++++++++++++++++ 10 files changed, 407 insertions(+) create mode 100644 test/containers/sequences/vector/db_cindex.pass.cpp create mode 100644 test/containers/sequences/vector/db_index.pass.cpp create mode 100644 test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp create mode 100644 test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp create mode 100644 test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp create mode 100644 test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp create mode 100644 test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp create mode 100644 test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp create mode 100644 test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp diff --git a/include/vector b/include/vector index d9c5c2f4..11d9a1b6 100644 --- a/include/vector +++ b/include/vector @@ -1550,6 +1550,8 @@ vector<_Tp, _Allocator>::erase(const_iterator __position) "vector::erase(iterator) called with an iterator not" " referring to this vector"); #endif + _LIBCPP_ASSERT(__position != end(), + "vector::erase(iterator) called with a non-dereferenceable iterator"); pointer __p = const_cast(&*__position); iterator __r = __make_iter(__p); this->__destruct_at_end(_VSTD::move(__p + 1, this->__end_, __p)); diff --git a/test/containers/sequences/vector/db_cindex.pass.cpp b/test/containers/sequences/vector/db_cindex.pass.cpp new file mode 100644 index 00000000..5fef131e --- /dev/null +++ b/test/containers/sequences/vector/db_cindex.pass.cpp @@ -0,0 +1,46 @@ +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// + +// Index const vector out of bounds. + +#if _LIBCPP_DEBUG2 >= 1 + +#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate()) + +#include +#include +#include +#include +#include + +void f1() +{ + std::exit(0); +} + +int main() +{ + std::set_terminate(f1); + typedef int T; + typedef std::vector C; + const C c(1); + assert(c[0] == 0); + assert(c[1] == 0); + assert(false); +} + +#else + +int main() +{ +} + +#endif diff --git a/test/containers/sequences/vector/db_index.pass.cpp b/test/containers/sequences/vector/db_index.pass.cpp new file mode 100644 index 00000000..e906decc --- /dev/null +++ b/test/containers/sequences/vector/db_index.pass.cpp @@ -0,0 +1,47 @@ +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// + +// Index vector out of bounds. + +#if _LIBCPP_DEBUG2 >= 1 + +#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate()) + +#include +#include +#include +#include +#include + +void f1() +{ + std::exit(0); +} + +int main() +{ + std::set_terminate(f1); + typedef int T; + typedef std::vector C; + C c(1); + assert(c[0] == 0); + c.clear(); + assert(c[0] == 0); + assert(false); +} + +#else + +int main() +{ +} + +#endif diff --git a/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp b/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp new file mode 100644 index 00000000..29669342 --- /dev/null +++ b/test/containers/sequences/vector/vector.modifiers/erase_iter_db1.pass.cpp @@ -0,0 +1,44 @@ +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// + +// Call erase(const_iterator position) with end() + +#if _LIBCPP_DEBUG2 >= 1 + +#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate()) + +#include +#include +#include +#include + +void f1() +{ + std::exit(0); +} + +int main() +{ + std::set_terminate(f1); + int a1[] = {1, 2, 3}; + std::vector l1(a1, a1+3); + std::vector::const_iterator i = l1.end(); + l1.erase(i); + assert(false); +} + +#else + +int main() +{ +} + +#endif diff --git a/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp b/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp new file mode 100644 index 00000000..f67ddb4a --- /dev/null +++ b/test/containers/sequences/vector/vector.modifiers/erase_iter_db2.pass.cpp @@ -0,0 +1,45 @@ +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// + +// Call erase(const_iterator position) with iterator from another container + +#if _LIBCPP_DEBUG2 >= 1 + +#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate()) + +#include +#include +#include +#include + +void f1() +{ + std::exit(0); +} + +int main() +{ + std::set_terminate(f1); + int a1[] = {1, 2, 3}; + std::vector l1(a1, a1+3); + std::vector l2(a1, a1+3); + std::vector::const_iterator i = l2.begin(); + l1.erase(i); + assert(false); +} + +#else + +int main() +{ +} + +#endif diff --git a/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp b/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp new file mode 100644 index 00000000..11395baa --- /dev/null +++ b/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db1.pass.cpp @@ -0,0 +1,44 @@ +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// + +// Call erase(const_iterator first, const_iterator last); with first iterator from another container + +#if _LIBCPP_DEBUG2 >= 1 + +#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate()) + +#include +#include +#include +#include + +void f1() +{ + std::exit(0); +} + +int main() +{ + std::set_terminate(f1); + int a1[] = {1, 2, 3}; + std::vector l1(a1, a1+3); + std::vector l2(a1, a1+3); + std::vector::iterator i = l1.erase(l2.cbegin(), l1.cbegin()+1); + assert(false); +} + +#else + +int main() +{ +} + +#endif diff --git a/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp b/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp new file mode 100644 index 00000000..202fef4a --- /dev/null +++ b/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db2.pass.cpp @@ -0,0 +1,44 @@ +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// + +// Call erase(const_iterator first, const_iterator last); with second iterator from another container + +#if _LIBCPP_DEBUG2 >= 1 + +#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate()) + +#include +#include +#include +#include + +void f1() +{ + std::exit(0); +} + +int main() +{ + std::set_terminate(f1); + int a1[] = {1, 2, 3}; + std::vector l1(a1, a1+3); + std::vector l2(a1, a1+3); + std::vector::iterator i = l1.erase(l1.cbegin(), l2.cbegin()+1); + assert(false); +} + +#else + +int main() +{ +} + +#endif diff --git a/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp b/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp new file mode 100644 index 00000000..6df60bdb --- /dev/null +++ b/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db3.pass.cpp @@ -0,0 +1,44 @@ +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// + +// Call erase(const_iterator first, const_iterator last); with both iterators from another container + +#if _LIBCPP_DEBUG2 >= 1 + +#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate()) + +#include +#include +#include +#include + +void f1() +{ + std::exit(0); +} + +int main() +{ + std::set_terminate(f1); + int a1[] = {1, 2, 3}; + std::vector l1(a1, a1+3); + std::vector l2(a1, a1+3); + std::vector::iterator i = l1.erase(l2.cbegin(), l2.cbegin()+1); + assert(false); +} + +#else + +int main() +{ +} + +#endif diff --git a/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp b/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp new file mode 100644 index 00000000..a8bc2be6 --- /dev/null +++ b/test/containers/sequences/vector/vector.modifiers/erase_iter_iter_db4.pass.cpp @@ -0,0 +1,43 @@ +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// + +// Call erase(const_iterator first, const_iterator last); with a bad range + +#if _LIBCPP_DEBUG2 >= 1 + +#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate()) + +#include +#include +#include +#include + +void f1() +{ + std::exit(0); +} + +int main() +{ + std::set_terminate(f1); + int a1[] = {1, 2, 3}; + std::vector l1(a1, a1+3); + std::vector::iterator i = l1.erase(l1.cbegin()+1, l1.cbegin()); + assert(false); +} + +#else + +int main() +{ +} + +#endif diff --git a/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp b/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp new file mode 100644 index 00000000..ac6ee04b --- /dev/null +++ b/test/containers/sequences/vector/vector.modifiers/pop_back.pass.cpp @@ -0,0 +1,48 @@ +//===----------------------------------------------------------------------===// +// +// 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. +// +//===----------------------------------------------------------------------===// + +// + +// void pop_back(); + +#if _LIBCPP_DEBUG2 >= 1 +#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::terminate()) +#endif + +#include +#include +#include "../../../stack_allocator.h" + +#if _LIBCPP_DEBUG2 >= 1 +#include +#include + +void f1() +{ + std::exit(0); +} +#endif + +int main() +{ +#if _LIBCPP_DEBUG2 >= 1 + std::set_terminate(f1); +#endif + { + std::vector c; + c.push_back(1); + assert(c.size() == 1); + c.pop_back(); + assert(c.size() == 0); +#if _LIBCPP_DEBUG2 >= 1 + c.pop_back(); + assert(false); +#endif + } +}