Import compiler-rt release_34 branch r197381.vendor/compiler-rt/compiler-rt-r197381

https://llvm.org/svn/llvm-project/compiler-rt/branches/release_34@197381

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/tsan/tests/unit/tsan_mman_test.cc b/lib/tsan/tests/unit/tsan_mman_test.cc
index 0961d2b75d11..e1ad7ac51ad6 100644
--- a/lib/tsan/tests/unit/tsan_mman_test.cc
+++ b/lib/tsan/tests/unit/tsan_mman_test.cc
@@ -164,7 +164,9 @@ TEST(Mman, CallocOverflow) {
   size_t kArraySize = 4096;
   volatile size_t kMaxSizeT = std::numeric_limits<size_t>::max();
   volatile size_t kArraySize2 = kMaxSizeT / kArraySize + 10;
-  volatile void *p = calloc(kArraySize, kArraySize2);  // Should return 0.
+  volatile void *p = NULL;
+  EXPECT_DEATH(p = calloc(kArraySize, kArraySize2),
+               "allocator is terminating the process instead of returning 0");
   EXPECT_EQ(0L, p);
 }