* Expose new command line arg --debug-pass for gccas and llc debugging

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

diff --git a/lib/VMCore/iMemory.cpp b/lib/VMCore/iMemory.cpp
index a0a7b0f9793684a65bee8fceacfad184a6f0ffe2..4226a69615750a96e3d86ef5b9fb4607f1df56d3 100644 (file)
--- a/lib/VMCore/iMemory.cpp
+++ b/lib/VMCore/iMemory.cpp
@@ -6,6 +6,11 @@
 
 #include "llvm/iMemory.h"
 
+static inline const Type *checkType(const Type *Ty) {
+  assert(Ty && "Invalid indices for type!");
+  return Ty;
+}
+
 //===----------------------------------------------------------------------===//
 //                        MemAccessInst Implementation
 //===----------------------------------------------------------------------===//
@@ -17,50 +22,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 +60,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,8 +72,8 @@ LoadInst::LoadInst(Value *Ptr, const string &Name = "")
 //                           StoreInst Implementation
 //===----------------------------------------------------------------------===//
 
-StoreInst::StoreInst(Value *Val, Value *Ptr, const vector<Value*> &Idx,
-                    const string &Name = "")
+StoreInst::StoreInst(Value *Val, Value *Ptr, const std::vector<Value*> &Idx,
+                    const std::string &Name = "")
   : MemAccessInst(Type::VoidTy, Store, Name) {
   assert(getIndexedType(Ptr->getType(), Idx) && "Store operands invalid!");
   
@@ -95,7 +85,7 @@ 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 = "")
+StoreInst::StoreInst(Value *Val, Value *Ptr, const std::string &Name = "")
   : MemAccessInst(Type::VoidTy, Store, Name) {
   
   Operands.reserve(2);
@@ -108,9 +98,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());
@@ -121,5 +112,5 @@ GetElementPtrInst::GetElementPtrInst(Value *Ptr, const vector<Value*> &Idx,
 }
 
 bool GetElementPtrInst::isStructSelector() const {
-  return ((PointerType*)Operands[0]->getType())->getValueType()->isStructType();
+  return ((PointerType*)Operands[0]->getType())->getElementType()->isStructType();
 }