From c4b6d0ebab4cfa0942aed43f030f3d57179c112e Mon Sep 17 00:00:00 2001 From: Serge Pavlov Date: Wed, 30 May 2018 09:01:12 +0000 Subject: Revert commit 333506 It looks like this commit is responsible for the fail: http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-autoconf/builds/24382. llvm-svn: 333518 --- llvm/lib/Support/FoldingSet.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Support/FoldingSet.cpp') diff --git a/llvm/lib/Support/FoldingSet.cpp b/llvm/lib/Support/FoldingSet.cpp index ec7d57586e8..94237954903 100644 --- a/llvm/lib/Support/FoldingSet.cpp +++ b/llvm/lib/Support/FoldingSet.cpp @@ -214,8 +214,11 @@ static void **GetBucketFor(unsigned Hash, void **Buckets, unsigned NumBuckets) { /// AllocateBuckets - Allocated initialized bucket memory. static void **AllocateBuckets(unsigned NumBuckets) { - void **Buckets = static_cast(safe_calloc(NumBuckets + 1, - sizeof(void*))); + void **Buckets = static_cast(calloc(NumBuckets+1, sizeof(void*))); + + if (Buckets == nullptr) + report_bad_alloc_error("Allocation of Buckets failed."); + // Set the very last bucket to be a non-null "pointer". Buckets[NumBuckets] = reinterpret_cast(-1); return Buckets; -- cgit v1.2.3