Placate MSVC's unchecked malloc warnings.

llvm-svn: 273374

4 files changed, 12 insertions, 5 deletions

diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
index dc4add7d061..5887bb0bdf3 100644
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_nothrow_replace.pass.cpp
@@ -26,7 +26,9 @@ int new_called = 0;
 void* operator new(std::size_t s) throw(std::bad_alloc)
 {
     ++new_called;
-    return std::malloc(s);
+    void* ret = std::malloc(s);
+    if (!ret) std::abort(); // placate MSVC's unchecked malloc warning
+    return  ret;
 }
 
 void  operator delete(void* p) throw()
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
index f3edaa0fba8..1e78ea8fe26 100644
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_array_replace.pass.cpp
@@ -26,7 +26,9 @@ volatile int new_called = 0;
 void* operator new(std::size_t s) throw(std::bad_alloc)
 {
     ++new_called;
-    return std::malloc(s);
+    void* ret = std::malloc(s);
+    if (!ret) std::abort(); // placate MSVC's unchecked malloc warning
+    return  ret;
 }
 
 void  operator delete(void* p) throw()
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
index 9604612f7f5..eb8319bac2f 100644
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_nothrow_replace.pass.cpp
@@ -14,7 +14,6 @@
 // TODO Investigate why UBSAN prevents nothrow new from calling our replacement.
 // XFAIL: ubsan
 
-
 #include <new>
 #include <cstddef>
 #include <cstdlib>
@@ -26,7 +25,9 @@ int new_called = 0;
 void* operator new(std::size_t s) throw(std::bad_alloc)
 {
     ++new_called;
-    return std::malloc(s);
+    void* ret = std::malloc(s);
+    if (!ret) std::abort(); // placate MSVC's unchecked malloc warning
+    return ret;
 }
 
 void  operator delete(void* p) throw()
diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
index 0df3a93703d..6056ed7bb0b 100644
--- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
+++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_replace.pass.cpp
@@ -22,7 +22,9 @@ int new_called = 0;
 void* operator new(std::size_t s) throw(std::bad_alloc)
 {
     ++new_called;
-    return std::malloc(s);
+    void* ret = std::malloc(s);
+    if (!ret) std::abort(); // placate MSVC's unchecked malloc warning
+    return ret;
 }
 
 void  operator delete(void* p) throw()