diff options
author | Serge Pavlov <sepavloff@gmail.com> | 2018-05-30 09:01:12 +0000 |
---|---|---|
committer | Serge Pavlov <sepavloff@gmail.com> | 2018-05-30 09:01:12 +0000 |
commit | c4b6d0ebab4cfa0942aed43f030f3d57179c112e (patch) | |
tree | be72544769b40276a162ab35157b347253cc1bf2 /llvm/lib/Support/FoldingSet.cpp | |
parent | f426fc7000fb6c4875cdcd846c07069f025b2e3d (diff) | |
download | bcm5719-llvm-c4b6d0ebab4cfa0942aed43f030f3d57179c112e.tar.gz bcm5719-llvm-c4b6d0ebab4cfa0942aed43f030f3d57179c112e.zip |
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
Diffstat (limited to 'llvm/lib/Support/FoldingSet.cpp')
-rw-r--r-- | llvm/lib/Support/FoldingSet.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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<void**>(safe_calloc(NumBuckets + 1, - sizeof(void*))); + void **Buckets = static_cast<void**>(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<void*>(-1); return Buckets; |