Change allocator<T>::allocate to throw length_error, not bad_alloc
llvm-svn: 268842
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 4524d6e73953322eafee72aba62ddebef8f7c5cd
diff --git a/include/memory b/include/memory
index 7888303..8378aef 100644
--- a/include/memory
+++ b/include/memory
@@ -607,6 +607,7 @@
#include <__functional_base>
#include <iosfwd>
#include <tuple>
+#include <stdexcept>
#include <cstring>
#if defined(_LIBCPP_NO_EXCEPTIONS)
#include <cassert>
@@ -1728,11 +1729,8 @@
_LIBCPP_INLINE_VISIBILITY pointer allocate(size_type __n, allocator<void>::const_pointer = 0)
{
if (__n > max_size())
-#ifndef _LIBCPP_NO_EXCEPTIONS
- throw bad_alloc();
-#else
- assert(!"allocator<T>::allocate::bad_alloc");
-#endif
+ __libcpp_throw(length_error("allocator<T>::allocate(size_t n)"
+ " 'n' exceeds maximum supported size"));
return static_cast<pointer>(_VSTD::__allocate(__n * sizeof(_Tp)));
}
_LIBCPP_INLINE_VISIBILITY void deallocate(pointer __p, size_type) _NOEXCEPT
@@ -1827,13 +1825,10 @@
_LIBCPP_INLINE_VISIBILITY pointer allocate(size_type __n, allocator<void>::const_pointer = 0)
{
if (__n > max_size())
-#ifndef _LIBCPP_NO_EXCEPTIONS
- throw bad_alloc();
-#else
- assert(!"allocator<const T>::allocate::bad_alloc");
-#endif
+ __libcpp_throw(length_error("allocator<const T>::allocate(size_t n)"
+ " 'n' exceeds maximum supported size"));
return static_cast<pointer>(_VSTD::__allocate(__n * sizeof(_Tp)));
- }
+ }
_LIBCPP_INLINE_VISIBILITY void deallocate(pointer __p, size_type) _NOEXCEPT
{_VSTD::__deallocate((void*)__p);}
_LIBCPP_INLINE_VISIBILITY size_type max_size() const _NOEXCEPT