summaryrefslogtreecommitdiffstats
path: root/libcxx/src
diff options
context:
space:
mode:
authorFangrui Song <maskray@google.com>2018-10-01 17:21:07 +0000
committerFangrui Song <maskray@google.com>2018-10-01 17:21:07 +0000
commit7cd67904f77608a70fa87aacb254fff6bc94f6ba (patch)
treeb15481f2933c6f4476f6fd919b37c8e82a3dd1ba /libcxx/src
parent23b62aa6d44b8547a039672df7072fb0daff9d08 (diff)
downloadbcm5719-llvm-7cd67904f77608a70fa87aacb254fff6bc94f6ba.tar.gz
bcm5719-llvm-7cd67904f77608a70fa87aacb254fff6bc94f6ba.zip
Remove redundant null pointer check in operator delete
Summary: C89 4.10.3.2 The free function C99 7.20.3.2 The free function C11 7.22.3.3 The free function If ptr is a null pointer, no action shall occur. _aligned_free on MSDN: If memblock is a NULL pointer, this function simply performs no actions. Reviewers: EricWF, mclow.lists, khng300, hotpxl Reviewed By: mclow.lists, khng300, hotpxl Subscribers: lichray, llvm-commits, hotpxl, khng300, christof, ldionne, cfe-commits, libcxx-commits Differential Revision: https://reviews.llvm.org/D52401 llvm-svn: 343503
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/new.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/libcxx/src/new.cpp b/libcxx/src/new.cpp
index 8013d89ae3c..35f481db08a 100644
--- a/libcxx/src/new.cpp
+++ b/libcxx/src/new.cpp
@@ -135,8 +135,7 @@ _LIBCPP_WEAK
void
operator delete(void* ptr) _NOEXCEPT
{
- if (ptr)
- ::free(ptr);
+ ::free(ptr);
}
_LIBCPP_WEAK
@@ -257,11 +256,10 @@ _LIBCPP_WEAK
void
operator delete(void* ptr, std::align_val_t) _NOEXCEPT
{
- if (ptr)
#if defined(_LIBCPP_MSVCRT_LIKE)
- ::_aligned_free(ptr);
+ ::_aligned_free(ptr);
#else
- ::free(ptr);
+ ::free(ptr);
#endif
}
OpenPOWER on IntegriCloud