Changes so that iMemory.h doesn't include DerivedTypes.h

[oota-llvm.git] / lib / VMCore / iMemory.cpp

diff --git a/lib/VMCore/iMemory.cpp b/lib/VMCore/iMemory.cpp
index a0a7b0f9793684a65bee8fceacfad184a6f0ffe2..0a62d1cae069f313e6cfaafad6e0dd28a5fa62d5 100644 (file)
--- a/lib/VMCore/iMemory.cpp
+++ b/lib/VMCore/iMemory.cpp
@@ -5,6 +5,38 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/iMemory.h"
+#include "llvm/Constants.h"
+#include "llvm/DerivedTypes.h"
+
+static inline const Type *checkType(const Type *Ty) {
+  assert(Ty && "Invalid indices for type!");
+  return Ty;
+}
+
+AllocationInst::AllocationInst(const Type *Ty, Value *ArraySize, unsigned iTy, 
+                               const std::string &Name = "")
+  : Instruction(Ty, iTy, Name) {
+  assert(Ty->isPointerType() && "Can't allocate a non pointer type!");
+
+  // ArraySize defaults to 1.
+  if (!ArraySize) ArraySize = ConstantUInt::get(Type::UIntTy, 1);
+
+  Operands.reserve(1);
+  assert(ArraySize->getType() == Type::UIntTy &&
+         "Malloc/Allocation array size != UIntTy!");
+
+  Operands.push_back(Use(ArraySize, this));
+}
+
+bool AllocationInst::isArrayAllocation() const {
+  return getNumOperands() == 1 &&
+         getOperand(0) != ConstantUInt::get(Type::UIntTy, 1);
+}
+
+const Type *AllocationInst::getAllocatedType() const {
+  return getType()->getElementType();
+}
+
 
 //===----------------------------------------------------------------------===//
 //                        MemAccessInst Implementation
@@ -17,50 +49,35 @@
 // pointer type.
 //
 const Type* MemAccessInst::getIndexedType(const Type *Ptr, 
-                                         const vector<Value*> &Idx,
+                                         const std::vector<Value*> &Idx,
                                          bool AllowCompositeLeaf = false) {
   if (!Ptr->isPointerType()) return 0;   // Type isn't a pointer type!
+
+  // Handle the special case of the empty set index set...
+  if (Idx.empty()) return cast<PointerType>(Ptr)->getElementType();
  
-  // Get the type pointed to...
-  Ptr = cast<PointerType>(Ptr)->getValueType();
-  
   unsigned CurIDX = 0;
-  while (const CompositeType *ST = dyn_cast<CompositeType>(Ptr)) {
-    if (Idx.size() == CurIDX)
-      return AllowCompositeLeaf ? Ptr : 0;   // Can't load a whole structure!?!?
+  while (const CompositeType *CT = dyn_cast<CompositeType>(Ptr)) {
+    if (Idx.size() == CurIDX) {
+      if (AllowCompositeLeaf || CT->isFirstClassType()) return Ptr;
+      return 0;   // Can't load a whole structure or array!?!?
+    }
 
     Value *Index = Idx[CurIDX++];
-    if (!ST->indexValid(Index)) return 0;
-    Ptr = ST->getTypeAtIndex(Index);
+    if (!CT->indexValid(Index)) return 0;
+    Ptr = CT->getTypeAtIndex(Index);
   }
   return CurIDX == Idx.size() ? Ptr : 0;
 }
 
 
-#if 1
-#include "llvm/ConstantVals.h"
-const vector<Constant*> MemAccessInst::getIndicesBROKEN() const {
-  cerr << "MemAccessInst::getIndices() does not do what you want it to.  Talk"
-       << " to Chris about this.  We can phase it out after the paper.\n";
-
-  vector<Constant*> RetVal;
-
-  // THIS CODE WILL FAIL IF A NON CONSTANT INDEX IS USED AS AN ARRAY INDEX
-  // THIS IS WHY YOU SHOULD NOT USE THIS FUNCTION ANY MORE!!!
-  for (unsigned i = getFirstIndexOperandNumber(); i < getNumOperands(); ++i)
-    RetVal.push_back(cast<Constant>(getOperand(i)));
-
-  return RetVal;
-}
-#endif
-
 //===----------------------------------------------------------------------===//
 //                           LoadInst Implementation
 //===----------------------------------------------------------------------===//
 
-LoadInst::LoadInst(Value *Ptr, const vector<Value*> &Idx,
-                  const string &Name = "")
-  : MemAccessInst(getIndexedType(Ptr->getType(), Idx), Load, Name) {
+LoadInst::LoadInst(Value *Ptr, const std::vector<Value*> &Idx,
+                  const std::string &Name = "")
+  : MemAccessInst(checkType(getIndexedType(Ptr->getType(), Idx)), Load, Name) {
   assert(getIndexedType(Ptr->getType(), Idx) && "Load operands invalid!");
   Operands.reserve(1+Idx.size());
   Operands.push_back(Use(Ptr, this));
@@ -70,8 +87,8 @@ LoadInst::LoadInst(Value *Ptr, const vector<Value*> &Idx,
   
 }
 
-LoadInst::LoadInst(Value *Ptr, const string &Name = "")
-  : MemAccessInst(cast<PointerType>(Ptr->getType())->getValueType(),
+LoadInst::LoadInst(Value *Ptr, const std::string &Name = "")
+  : MemAccessInst(cast<PointerType>(Ptr->getType())->getElementType(),
                   Load, Name) {
   Operands.reserve(1);
   Operands.push_back(Use(Ptr, this));
@@ -82,9 +99,8 @@ LoadInst::LoadInst(Value *Ptr, const string &Name = "")
 //                           StoreInst Implementation
 //===----------------------------------------------------------------------===//
 
-StoreInst::StoreInst(Value *Val, Value *Ptr, const vector<Value*> &Idx,
-                    const string &Name = "")
-  : MemAccessInst(Type::VoidTy, Store, Name) {
+StoreInst::StoreInst(Value *Val, Value *Ptr, const std::vector<Value*> &Idx)
+  : MemAccessInst(Type::VoidTy, Store, "") {
   assert(getIndexedType(Ptr->getType(), Idx) && "Store operands invalid!");
   
   Operands.reserve(2+Idx.size());
@@ -95,8 +111,8 @@ StoreInst::StoreInst(Value *Val, Value *Ptr, const vector<Value*> &Idx,
     Operands.push_back(Use(Idx[i], this));
 }
 
-StoreInst::StoreInst(Value *Val, Value *Ptr, const string &Name = "")
-  : MemAccessInst(Type::VoidTy, Store, Name) {
+StoreInst::StoreInst(Value *Val, Value *Ptr)
+  : MemAccessInst(Type::VoidTy, Store, "") {
   
   Operands.reserve(2);
   Operands.push_back(Use(Val, this));
@@ -108,9 +124,10 @@ StoreInst::StoreInst(Value *Val, Value *Ptr, const string &Name = "")
 //                       GetElementPtrInst Implementation
 //===----------------------------------------------------------------------===//
 
-GetElementPtrInst::GetElementPtrInst(Value *Ptr, const vector<Value*> &Idx,
-                                    const string &Name = "")
-  : MemAccessInst(PointerType::get(getIndexedType(Ptr->getType(), Idx, true)),
+GetElementPtrInst::GetElementPtrInst(Value *Ptr, const std::vector<Value*> &Idx,
+                                    const std::string &Name = "")
+  : MemAccessInst(PointerType::get(checkType(getIndexedType(Ptr->getType(),
+                                                            Idx, true))),
                  GetElementPtr, Name) {
   assert(getIndexedType(Ptr->getType(), Idx, true) && "gep operands invalid!");
   Operands.reserve(1+Idx.size());
@@ -120,6 +137,14 @@ GetElementPtrInst::GetElementPtrInst(Value *Ptr, const vector<Value*> &Idx,
     Operands.push_back(Use(Idx[i], this));
 }
 
-bool GetElementPtrInst::isStructSelector() const {
-  return ((PointerType*)Operands[0]->getType())->getValueType()->isStructType();
+
+//===----------------------------------------------------------------------===//
+//                             FreeInst Implementation
+//===----------------------------------------------------------------------===//
+
+FreeInst::FreeInst(Value *Ptr) : Instruction(Type::VoidTy, Free, "") {
+  assert(Ptr->getType()->isPointerType() && "Can't free nonpointer!");
+  Operands.reserve(1);
+  Operands.push_back(Use(Ptr, this));
 }
+