diff options
| author | Eric Christopher <echristo@gmail.com> | 2018-10-25 06:20:12 +0000 |
|---|---|---|
| committer | Eric Christopher <echristo@gmail.com> | 2018-10-25 06:20:12 +0000 |
| commit | 9bbee38db3b12c47a898e2723b69342355cdfe4f (patch) | |
| tree | b5b93821f494c8d150aa4ff590b34ea9de1cee24 /libcxx/include/__sso_allocator | |
| parent | 199325450932a06d4392cb4d87fd69fc163b00eb (diff) | |
| download | bcm5719-llvm-9bbee38db3b12c47a898e2723b69342355cdfe4f.tar.gz bcm5719-llvm-9bbee38db3b12c47a898e2723b69342355cdfe4f.zip | |
Temporarily Revert "Implement sized deallocation for std::allocator and friends."
This is breaking the bots here (and related): http://lab.llvm.org:8011/builders/libcxx-libcxxabi-x86_64-linux-ubuntu-asan/builds/1428
This reverts commit r345214.
llvm-svn: 345239
Diffstat (limited to 'libcxx/include/__sso_allocator')
| -rw-r--r-- | libcxx/include/__sso_allocator | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/__sso_allocator b/libcxx/include/__sso_allocator index e16b680ec55..40027363a18 100644 --- a/libcxx/include/__sso_allocator +++ b/libcxx/include/__sso_allocator @@ -57,12 +57,12 @@ public: } return static_cast<pointer>(_VSTD::__libcpp_allocate(__n * sizeof(_Tp), __alignof(_Tp))); } - _LIBCPP_INLINE_VISIBILITY void deallocate(pointer __p, size_type __n) + _LIBCPP_INLINE_VISIBILITY void deallocate(pointer __p, size_type) { if (__p == (pointer)&buf_) __allocated_ = false; else - _VSTD::__libcpp_deallocate(__p, __n * sizeof(_Tp), __alignof(_Tp)); + _VSTD::__libcpp_deallocate(__p, __alignof(_Tp)); } _LIBCPP_INLINE_VISIBILITY size_type max_size() const throw() {return size_type(~0) / sizeof(_Tp);} |
