diff options
Diffstat (limited to 'lib/VMCore')
| -rw-r--r-- | lib/VMCore/Verifier.cpp | 5 | ||||
| -rw-r--r-- | lib/VMCore/iMemory.cpp | 63 |
2 files changed, 32 insertions, 36 deletions
diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index da65b1ce30..01a2835291 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -321,8 +321,9 @@ void Verifier::visitBinaryOperator(BinaryOperator &B) { } void Verifier::visitGetElementPtrInst(GetElementPtrInst &GEP) { - const Type *ElTy = MemAccessInst::getIndexedType(GEP.getOperand(0)->getType(), - GEP.copyIndices(), true); + const Type *ElTy = + GetElementPtrInst::getIndexedType(GEP.getOperand(0)->getType(), + std::vector<Value*>(GEP.idx_begin(), GEP.idx_end()), true); Assert1(ElTy, "Invalid indices for GEP pointer type!", &GEP); Assert2(PointerType::get(ElTy) == GEP.getType(), "GEP is not of right type for indices!", &GEP, ElTy); diff --git a/lib/VMCore/iMemory.cpp b/lib/VMCore/iMemory.cpp index 469a2c3361..4ec9e26fbe 100644 --- a/lib/VMCore/iMemory.cpp +++ b/lib/VMCore/iMemory.cpp @@ -39,39 +39,6 @@ const Type *AllocationInst::getAllocatedType() const { //===----------------------------------------------------------------------===// -// MemAccessInst Implementation -//===----------------------------------------------------------------------===// - -// getIndexedType - Returns the type of the element that would be loaded with -// a load instruction with the specified parameters. -// -// A null type is returned if the indices are invalid for the specified -// pointer type. -// -const Type* MemAccessInst::getIndexedType(const Type *Ptr, - const std::vector<Value*> &Idx, - bool AllowCompositeLeaf) { - if (!isa<PointerType>(Ptr)) 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(); - - unsigned CurIDX = 0; - 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 (!CT->indexValid(Index)) return 0; - Ptr = CT->getTypeAtIndex(Index); - } - return CurIDX == Idx.size() ? Ptr : 0; -} - - -//===----------------------------------------------------------------------===// // LoadInst Implementation //===----------------------------------------------------------------------===// @@ -102,7 +69,7 @@ StoreInst::StoreInst(Value *Val, Value *Ptr) GetElementPtrInst::GetElementPtrInst(Value *Ptr, const std::vector<Value*> &Idx, const std::string &Name) - : MemAccessInst(PointerType::get(checkType(getIndexedType(Ptr->getType(), + : Instruction(PointerType::get(checkType(getIndexedType(Ptr->getType(), Idx, true))), GetElementPtr, Name) { assert(getIndexedType(Ptr->getType(), Idx, true) && "gep operands invalid!"); @@ -113,6 +80,34 @@ GetElementPtrInst::GetElementPtrInst(Value *Ptr, const std::vector<Value*> &Idx, Operands.push_back(Use(Idx[i], this)); } +// getIndexedType - Returns the type of the element that would be loaded with +// a load instruction with the specified parameters. +// +// A null type is returned if the indices are invalid for the specified +// pointer type. +// +const Type* GetElementPtrInst::getIndexedType(const Type *Ptr, + const std::vector<Value*> &Idx, + bool AllowCompositeLeaf) { + if (!isa<PointerType>(Ptr)) 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(); + + unsigned CurIDX = 0; + 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 (!CT->indexValid(Index)) return 0; + Ptr = CT->getTypeAtIndex(Index); + } + return CurIDX == Idx.size() ? Ptr : 0; +} + //===----------------------------------------------------------------------===// // FreeInst Implementation |