From: Gabor Greif <ggreif@gmail.com>
Date: Thu, 11 Oct 2007 19:40:35 +0000 (+0000)
Subject: Fix an assertion abort on sparc. malloc(0) is allowed to
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=724441e64ad9dbf41579864d6364501aac8ba7db;p=oota-llvm.git

Fix an assertion abort on sparc. malloc(0) is allowed to
return NULL.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42871 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index 95e2143787c..f11cf816b22 100644
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -24,6 +24,7 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/MathExtras.h"
 #include <cmath>
+#include <algorithm>
 using namespace llvm;
 
 STATISTIC(NumDynamicInsts, "Number of dynamic instructions executed");
@@ -747,7 +748,8 @@ void Interpreter::visitAllocationInst(AllocationInst &I) {
 
   unsigned TypeSize = (size_t)TD.getTypeSize(Ty);
 
-  unsigned MemToAlloc = NumElements * TypeSize;
+  // Avoid malloc-ing zero bytes, use max()...
+  unsigned MemToAlloc = std::max(1U, NumElements * TypeSize);
 
   // Allocate enough memory to hold the type...
   void *Memory = malloc(MemToAlloc);