Fix isArrayAllocation() to be correct

llvm-svn: 1779

2 files changed, 8 insertions, 2 deletions

diff --git a/llvm/include/llvm/iMemory.h b/llvm/include/llvm/iMemory.h
index 13b1400d3a3..ec04b281dbc 100644
--- a/llvm/include/llvm/iMemory.h
+++ b/llvm/include/llvm/iMemory.h
@@ -35,9 +35,9 @@ public:
   }
 
   // isArrayAllocation - Return true if there is an allocation size parameter
-  // to the allocation instruction.
+  // to the allocation instruction that is not 1.
   //
-  inline bool isArrayAllocation() const { return Operands.size() == 1; }
+  bool isArrayAllocation() const;
 
   inline const Value *getArraySize() const {
     assert(isArrayAllocation()); return Operands[0];
diff --git a/llvm/lib/VMCore/iMemory.cpp b/llvm/lib/VMCore/iMemory.cpp
index 4226a696157..7280998a17d 100644
--- a/llvm/lib/VMCore/iMemory.cpp
+++ b/llvm/lib/VMCore/iMemory.cpp
@@ -5,12 +5,18 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/iMemory.h"
+#include "llvm/ConstantVals.h"
 
 static inline const Type *checkType(const Type *Ty) {
   assert(Ty && "Invalid indices for type!");
   return Ty;
 }
 
+bool AllocationInst::isArrayAllocation() const {
+  return getNumOperands() == 1 &&
+         getOperand(0) != ConstantUInt::get(Type::UIntTy, 1);
+}
+
 //===----------------------------------------------------------------------===//
 //                        MemAccessInst Implementation
 //===----------------------------------------------------------------------===//