Imported Upstream version 1.11.0+dfsg1

[rustc.git] / src / compiler-rt / lib / tsan / tests / unit / tsan_mman_test.cc

diff --git a/src/compiler-rt/lib/tsan/tests/unit/tsan_mman_test.cc b/src/compiler-rt/lib/tsan/tests/unit/tsan_mman_test.cc
index bfaefe6487055f0ebac7a39f87edfbb4041fded2..609141c592947f79f96b417358a9170809d338f0 100644 (file)
--- a/src/compiler-rt/lib/tsan/tests/unit/tsan_mman_test.cc
+++ b/src/compiler-rt/lib/tsan/tests/unit/tsan_mman_test.cc
@@ -141,11 +141,13 @@ TEST(Mman, CallocOverflow) {
   // which is overflown by tsan memory accesses functions in debug mode.
   return;
 #endif
+  ThreadState *thr = cur_thread();
+  uptr pc = 0;
   size_t kArraySize = 4096;
   volatile size_t kMaxSizeT = std::numeric_limits<size_t>::max();
   volatile size_t kArraySize2 = kMaxSizeT / kArraySize + 10;
   volatile void *p = NULL;
-  EXPECT_DEATH(p = calloc(kArraySize, kArraySize2),
+  EXPECT_DEATH(p = user_calloc(thr, pc, kArraySize, kArraySize2),
                "allocator is terminating the process instead of returning 0");
   EXPECT_EQ(0L, p);
 }