- 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@3682 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp
index 7c55f67..761ae00 100644
--- a/lib/Target/TargetData.cpp
+++ b/lib/Target/TargetData.cpp
@@ -157,17 +157,17 @@
assert(isa<PointerType>(Ty) && "Illegal argument for getIndexedOffset()");
uint64_t Result = 0;
- for (unsigned CurIDX = 0; CurIDX < Idx.size(); ++CurIDX) {
- if (Idx[CurIDX]->getType() == Type::UIntTy) {
+ for (unsigned CurIDX = 0; CurIDX != Idx.size(); ++CurIDX) {
+ if (Idx[CurIDX]->getType() == Type::LongTy) {
// Update Ty to refer to current element
Ty = cast<SequentialType>(Ty)->getElementType();
// Get the array index and the size of each array element.
// Both must be known constants, or this will fail.
// Also, the product needs to be sign-extended from 32 to 64 bits.
- uint64_t elementSize = this->getTypeSize(Ty);
- uint64_t arrayIdx = cast<ConstantUInt>(Idx[CurIDX])->getValue();
- Result += (uint64_t) (int) (arrayIdx * elementSize); // sign-extend
+ int64_t elementSize = (int64_t)getTypeSize(Ty);
+ int64_t arrayIdx = cast<ConstantSInt>(Idx[CurIDX])->getValue();
+ Result += (uint64_t)(arrayIdx * elementSize);
} else if (const StructType *STy = dyn_cast<const StructType>(Ty)) {
assert(Idx[CurIDX]->getType() == Type::UByteTy && "Illegal struct idx");
diff --git a/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp b/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
index a6d7e37..7a2ad4b 100644
--- a/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
+++ b/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
@@ -94,7 +94,7 @@
continue;
} else {
// Not the first index: include initial [0] to deref the last ptr
- Indices.push_back(Constant::getNullValue(Type::UIntTy));
+ Indices.push_back(Constant::getNullValue(Type::LongTy));
}
Indices.push_back(*OI);
@@ -110,7 +110,7 @@
// Get the final index vector, including an initial [0] as before.
std::vector<Value*> Indices;
- Indices.push_back(Constant::getNullValue(Type::UIntTy));
+ Indices.push_back(Constant::getNullValue(Type::LongTy));
Indices.push_back(*OI);
Value *NewVal = new GetElementPtrInst(LastPtr, Indices, GEP.getName(),
diff --git a/lib/Transforms/Scalar/InstructionCombining.cpp b/lib/Transforms/Scalar/InstructionCombining.cpp
index 9c1076e..179f3b2 100644
--- a/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -649,7 +649,7 @@
// Is it 'getelementptr %P, uint 0' or 'getelementptr %P'
// If so, eliminate the noop.
if ((GEP.getNumOperands() == 2 &&
- GEP.getOperand(1) == Constant::getNullValue(Type::UIntTy)) ||
+ GEP.getOperand(1) == Constant::getNullValue(Type::LongTy)) ||
GEP.getNumOperands() == 1)
return ReplaceInstUsesWith(GEP, GEP.getOperand(0));
@@ -669,7 +669,7 @@
*cast<Constant>(GEP.getOperand(1));
assert(Indices[0] != 0 && "Constant folding of uint's failed!?");
- } else if (*GEP.idx_begin() == ConstantUInt::get(Type::UIntTy, 0)) {
+ } else if (*GEP.idx_begin() == ConstantUInt::getNullValue(Type::LongTy)) {
// Otherwise we can do the fold if the first index of the GEP is a zero
Indices.insert(Indices.end(), Src->idx_begin(), Src->idx_end());
Indices.insert(Indices.end(), GEP.idx_begin()+1, GEP.idx_end());