From 106ff4551c9c35bb6bcbdd6ca50543b100a7658e Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Wed, 11 Sep 2002 01:21:29 +0000 Subject: - Change getelementptr instruction to use long indexes instead of uint indexes for sequential types. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3681 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/CodeGen') diff --git a/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp b/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp index 870bbbd787..036b1a7f3f 100644 --- a/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp +++ b/lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp @@ -113,12 +113,12 @@ static Value* FoldGetElemChain(InstrTreeNode* ptrNode, vector& chainIdxVec) { InstructionNode* gepNode = dyn_cast(ptrNode); - if (gepNode == NULL) - return NULL; // ptr value is not computed in this tree - GetElementPtrInst* gepInst = - dyn_cast(gepNode->getInstruction()); - if (gepInst == NULL) // ptr value does not come from GEP instruction + dyn_cast_or_null(gepNode->getInstruction()); + + // ptr value is not computed in this tree or ptr value does not come from GEP + // instruction + if (gepInst == NULL) return NULL; // Return NULL if we don't fold any instructions in. @@ -149,8 +149,8 @@ FoldGetElemChain(InstrTreeNode* ptrNode, vector& chainIdxVec) ptrVal = gepInst->getPointerOperand(); // Check for a leading [0] index, if any. It will be discarded later. - ConstantUInt* CV = dyn_cast((Value*) *firstIdx); - hasLeadingZero = bool(CV && CV->getValue() == 0); + hasLeadingZero = (*firstIdx == + Constant::getNullValue((*firstIdx)->getType())); // Insert its index vector at the start, skipping any leading [0] chainIdxVec.insert(chainIdxVec.begin(), @@ -168,7 +168,7 @@ FoldGetElemChain(InstrTreeNode* ptrNode, vector& chainIdxVec) // If the first getElementPtr instruction had a leading [0], add it back. // Note that this instruction is the *last* one successfully folded above. if (ptrVal && hasLeadingZero) - chainIdxVec.insert(chainIdxVec.begin(), ConstantUInt::get(Type::UIntTy,0)); + chainIdxVec.insert(chainIdxVec.begin(), ConstantSInt::get(Type::LongTy,0)); return ptrVal; } -- cgit v1.2.3-70-g09d2