Fix incorrect exception handling behavior in the uninitialized algorithms
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@283941 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/memory b/include/memory
index d5b39cb..69068f3 100644
--- a/include/memory
+++ b/include/memory
@@ -3709,61 +3709,6 @@
#if _LIBCPP_STD_VER > 14
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void uninitialized_default_construct(_ForwardIterator __first, _ForwardIterator __last) {
- using _Vt = typename iterator_traits<_ForwardIterator>::value_type;
- for (; __first != __last; ++__first)
- ::new((void*)_VSTD::addressof(*__first)) _Vt;
-}
-
-template <class _ForwardIterator, class _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator uninitialized_default_construct_n(_ForwardIterator __first, _Size __n) {
- using _Vt = typename iterator_traits<_ForwardIterator>::value_type;
- for (; __n > 0; (void)++__first, --__n)
- ::new((void*)_VSTD::addressof(*__first)) _Vt;
- return __first;
-}
-
-
-template <class _ForwardIterator>
-inline _LIBCPP_INLINE_VISIBILITY
-void uninitialized_value_construct(_ForwardIterator __first, _ForwardIterator __last) {
- using _Vt = typename iterator_traits<_ForwardIterator>::value_type;
- for (; __first != __last; ++__first)
- ::new((void*)_VSTD::addressof(*__first)) _Vt();
-}
-
-template <class _ForwardIterator, class _Size>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIterator uninitialized_value_construct_n(_ForwardIterator __first, _Size __n) {
- using _Vt = typename iterator_traits<_ForwardIterator>::value_type;
- for (; __n > 0; (void)++__first, --__n)
- ::new((void*)_VSTD::addressof(*__first)) _Vt();
- return __first;
-}
-
-
-template <class _InputIt, class _ForwardIt>
-inline _LIBCPP_INLINE_VISIBILITY
-_ForwardIt uninitialized_move(_InputIt __first, _InputIt __last, _ForwardIt __res) {
- using _Vt = typename iterator_traits<_ForwardIt>::value_type;
- for (; __first != __last; (void)++__res, ++__first)
- ::new((void*)_VSTD::addressof(*__res)) _Vt(std::move(*__first));
- return __res;
-}
-
-template <class _InputIt, class _Size, class _ForwardIt>
-inline _LIBCPP_INLINE_VISIBILITY
-pair<_InputIt, _ForwardIt>
-uninitialized_move_n(_InputIt __first, _Size __n, _ForwardIt __res) {
- using _Vt = typename iterator_traits<_ForwardIt>::value_type;
- for (; __n > 0; ++__res, (void)++__first, --__n)
- ::new((void*)_VSTD::addressof(*__res)) _Vt(std::move(*__first));
- return {__first, __res};
-}
-
template <class _Tp>
inline _LIBCPP_INLINE_VISIBILITY
void destroy_at(_Tp* __loc) {
@@ -3786,6 +3731,122 @@
return __first;
}
+template <class _ForwardIterator>
+inline _LIBCPP_INLINE_VISIBILITY
+void uninitialized_default_construct(_ForwardIterator __first, _ForwardIterator __last) {
+ using _Vt = typename iterator_traits<_ForwardIterator>::value_type;
+ auto __idx = __first;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ try {
+#endif
+ for (; __idx != __last; ++__idx)
+ ::new((void*)_VSTD::addressof(*__idx)) _Vt;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ } catch (...) {
+ _VSTD::destroy(__first, __idx);
+ throw;
+ }
+#endif
+}
+
+template <class _ForwardIterator, class _Size>
+inline _LIBCPP_INLINE_VISIBILITY
+_ForwardIterator uninitialized_default_construct_n(_ForwardIterator __first, _Size __n) {
+ using _Vt = typename iterator_traits<_ForwardIterator>::value_type;
+ auto __idx = __first;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ try {
+#endif
+ for (; __n > 0; (void)++__idx, --__n)
+ ::new((void*)_VSTD::addressof(*__idx)) _Vt;
+ return __idx;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ } catch (...) {
+ _VSTD::destroy(__first, __idx);
+ throw;
+ }
+#endif
+}
+
+
+template <class _ForwardIterator>
+inline _LIBCPP_INLINE_VISIBILITY
+void uninitialized_value_construct(_ForwardIterator __first, _ForwardIterator __last) {
+ using _Vt = typename iterator_traits<_ForwardIterator>::value_type;
+ auto __idx = __first;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ try {
+#endif
+ for (; __idx != __last; ++__idx)
+ ::new((void*)_VSTD::addressof(*__idx)) _Vt();
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ } catch (...) {
+ _VSTD::destroy(__first, __idx);
+ throw;
+ }
+#endif
+}
+
+template <class _ForwardIterator, class _Size>
+inline _LIBCPP_INLINE_VISIBILITY
+_ForwardIterator uninitialized_value_construct_n(_ForwardIterator __first, _Size __n) {
+ using _Vt = typename iterator_traits<_ForwardIterator>::value_type;
+ auto __idx = __first;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ try {
+#endif
+ for (; __n > 0; (void)++__idx, --__n)
+ ::new((void*)_VSTD::addressof(*__idx)) _Vt();
+ return __idx;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ } catch (...) {
+ _VSTD::destroy(__first, __idx);
+ throw;
+ }
+#endif
+}
+
+
+template <class _InputIt, class _ForwardIt>
+inline _LIBCPP_INLINE_VISIBILITY
+_ForwardIt uninitialized_move(_InputIt __first, _InputIt __last, _ForwardIt __first_res) {
+ using _Vt = typename iterator_traits<_ForwardIt>::value_type;
+ auto __idx = __first_res;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ try {
+#endif
+ for (; __first != __last; (void)++__idx, ++__first)
+ ::new((void*)_VSTD::addressof(*__idx)) _Vt(std::move(*__first));
+ return __idx;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ } catch (...) {
+ _VSTD::destroy(__first_res, __idx);
+ throw;
+ }
+#endif
+}
+
+template <class _InputIt, class _Size, class _ForwardIt>
+inline _LIBCPP_INLINE_VISIBILITY
+pair<_InputIt, _ForwardIt>
+uninitialized_move_n(_InputIt __first, _Size __n, _ForwardIt __first_res) {
+ using _Vt = typename iterator_traits<_ForwardIt>::value_type;
+ auto __idx = __first_res;
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ try {
+#endif
+ for (; __n > 0; ++__idx, (void)++__first, --__n)
+ ::new((void*)_VSTD::addressof(*__idx)) _Vt(std::move(*__first));
+ return {__first, __idx};
+#ifndef _LIBCPP_NO_EXCEPTIONS
+ } catch (...) {
+ _VSTD::destroy(__first_res, __idx);
+ throw;
+ }
+#endif
+}
+
+
#endif // _LIBCPP_STD_VER > 14
class _LIBCPP_EXCEPTION_ABI bad_weak_ptr
diff --git a/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp b/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp
index cd57769..533d516 100644
--- a/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp
+++ b/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct.pass.cpp
@@ -47,7 +47,7 @@
++count;
}
ThrowsCounted(ThrowsCounted const&) { assert(false); }
- ~ThrowsCounted() { --count; }
+ ~ThrowsCounted() { assert(count > 0); --count; }
friend void operator&(ThrowsCounted) = delete;
};
int ThrowsCounted::count = 0;
@@ -67,10 +67,8 @@
std::uninitialized_default_construct(It(p), It(p+N));
assert(false);
} catch (...) {}
- assert(ThrowsCounted::count == 3);
- assert(ThrowsCounted::constructed == 4); // forth construction throws
- std::destroy(p, p+3);
assert(ThrowsCounted::count == 0);
+ assert(ThrowsCounted::constructed == 4); // forth construction throws
#endif
}
diff --git a/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp b/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp
index bfb74b9..f22a74f 100644
--- a/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp
+++ b/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp
@@ -27,7 +27,7 @@
static void reset() { count = constructed = 0; }
explicit Counted() { ++count; ++constructed; }
Counted(Counted const&) { assert(false); }
- ~Counted() { --count; }
+ ~Counted() { assert(count > 0); --count; }
friend void operator&(Counted) = delete;
};
int Counted::count = 0;
@@ -47,7 +47,7 @@
++count;
}
ThrowsCounted(ThrowsCounted const&) { assert(false); }
- ~ThrowsCounted() { --count; }
+ ~ThrowsCounted() { assert(count > 0); --count; }
friend void operator&(ThrowsCounted) = delete;
};
int ThrowsCounted::count = 0;
@@ -66,10 +66,8 @@
std::uninitialized_default_construct_n(It(p), N);
assert(false);
} catch (...) {}
- assert(ThrowsCounted::count == 3);
- assert(ThrowsCounted::constructed == 4); // forth construction throws
- std::destroy(p, p+3);
assert(ThrowsCounted::count == 0);
+ assert(ThrowsCounted::constructed == 4); // forth construction throws
#endif
}
diff --git a/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp b/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp
index befe30a..c2d8606 100644
--- a/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp
+++ b/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/uninitialized_value_construct.pass.cpp
@@ -27,7 +27,7 @@
static void reset() { count = constructed = 0; }
explicit Counted() { ++count; ++constructed; }
Counted(Counted const&) { assert(false); }
- ~Counted() { --count; }
+ ~Counted() { assert(count > 0); --count; }
friend void operator&(Counted) = delete;
};
int Counted::count = 0;
@@ -47,7 +47,7 @@
++count;
}
ThrowsCounted(ThrowsCounted const&) { assert(false); }
- ~ThrowsCounted() { --count; }
+ ~ThrowsCounted() { assert(count > 0); --count; }
friend void operator&(ThrowsCounted) = delete;
};
int ThrowsCounted::count = 0;
@@ -66,10 +66,8 @@
std::uninitialized_value_construct(It(p), It(p+N));
assert(false);
} catch (...) {}
- assert(ThrowsCounted::count == 3);
- assert(ThrowsCounted::constructed == 4); // forth construction throws
- std::destroy(p, p+3);
assert(ThrowsCounted::count == 0);
+ assert(ThrowsCounted::constructed == 4); // forth construction throws
#endif
}
diff --git a/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp b/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp
index 6149838..d7a9542 100644
--- a/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp
+++ b/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move.pass.cpp
@@ -27,7 +27,7 @@
static void reset() { count = constructed = 0; }
explicit Counted(int&& x) : value(x) { x = 0; ++count; ++constructed; }
Counted(Counted const&) { assert(false); }
- ~Counted() { --count; }
+ ~Counted() { assert(count > 0); --count; }
friend void operator&(Counted) = delete;
int value;
};
@@ -48,7 +48,7 @@
x = 0;
}
ThrowsCounted(ThrowsCounted const&) { assert(false); }
- ~ThrowsCounted() { --count; }
+ ~ThrowsCounted() { assert(count > 0); --count; }
friend void operator&(ThrowsCounted) = delete;
};
int ThrowsCounted::count = 0;
@@ -68,15 +68,13 @@
std::uninitialized_move(values, values + N, It(p));
assert(false);
} catch (...) {}
- assert(ThrowsCounted::count == 3);
+ assert(ThrowsCounted::count == 0);
assert(ThrowsCounted::constructed == 4); // forth construction throws
assert(values[0] == 0);
assert(values[1] == 0);
assert(values[2] == 0);
assert(values[3] == 4);
assert(values[4] == 5);
- std::destroy(p, p+3);
- assert(ThrowsCounted::count == 0);
#endif
}
diff --git a/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp b/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp
index cf6af74..f27e572 100644
--- a/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp
+++ b/test/std/utilities/memory/specialized.algorithms/uninitialized.move/uninitialized_move_n.pass.cpp
@@ -27,7 +27,7 @@
static void reset() { count = constructed = 0; }
explicit Counted(int&& x) : value(x) { x = 0; ++count; ++constructed; }
Counted(Counted const&) { assert(false); }
- ~Counted() { --count; }
+ ~Counted() { assert(count > 0); --count; }
friend void operator&(Counted) = delete;
int value;
};
@@ -48,7 +48,7 @@
x = 0;
}
ThrowsCounted(ThrowsCounted const&) { assert(false); }
- ~ThrowsCounted() { --count; }
+ ~ThrowsCounted() { assert(count > 0); --count; }
friend void operator&(ThrowsCounted) = delete;
};
int ThrowsCounted::count = 0;
@@ -68,15 +68,13 @@
std::uninitialized_move_n(values, N, It(p));
assert(false);
} catch (...) {}
- assert(ThrowsCounted::count == 3);
+ assert(ThrowsCounted::count == 0);
assert(ThrowsCounted::constructed == 4); // forth construction throws
assert(values[0] == 0);
assert(values[1] == 0);
assert(values[2] == 0);
assert(values[3] == 4);
assert(values[4] == 5);
- std::destroy(p, p+3);
- assert(ThrowsCounted::count == 0);
#endif
}