mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-17 21:29:20 +00:00
Bug fix in TargetData::getIndexedOffset(): handle struct offset
after array offset correctly. The type was not being updated for array offsets! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3246 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
99d4a38c77
commit
ed0030e2bc
@ -153,12 +153,10 @@ unsigned char TargetData::getTypeAlignment(const Type *Ty) const {
|
|||||||
|
|
||||||
uint64_t TargetData::getIndexedOffset(const Type *ptrTy,
|
uint64_t TargetData::getIndexedOffset(const Type *ptrTy,
|
||||||
const std::vector<Value*> &Idx) const {
|
const std::vector<Value*> &Idx) const {
|
||||||
const PointerType *PtrTy = cast<const PointerType>(ptrTy);
|
const Type *Ty = ptrTy;
|
||||||
|
assert(isa<PointerType>(Ty) && "Illegal argument for getIndexedOffset()");
|
||||||
uint64_t Result = 0;
|
uint64_t Result = 0;
|
||||||
|
|
||||||
// Get the type pointed to...
|
|
||||||
const Type *Ty = PtrTy->getElementType();
|
|
||||||
|
|
||||||
for (unsigned CurIDX = 0; CurIDX < Idx.size(); ++CurIDX) {
|
for (unsigned CurIDX = 0; CurIDX < Idx.size(); ++CurIDX) {
|
||||||
if (Idx[CurIDX]->getType() == Type::UIntTy) {
|
if (Idx[CurIDX]->getType() == Type::UIntTy) {
|
||||||
// Get the array index and the size of each array element.
|
// Get the array index and the size of each array element.
|
||||||
@ -166,7 +164,10 @@ uint64_t TargetData::getIndexedOffset(const Type *ptrTy,
|
|||||||
unsigned arrayIdx = cast<ConstantUInt>(Idx[CurIDX])->getValue();
|
unsigned arrayIdx = cast<ConstantUInt>(Idx[CurIDX])->getValue();
|
||||||
uint64_t elementSize = this->getTypeSize(Ty);
|
uint64_t elementSize = this->getTypeSize(Ty);
|
||||||
Result += arrayIdx * elementSize;
|
Result += arrayIdx * elementSize;
|
||||||
|
|
||||||
|
// Update Ty to refer to current element
|
||||||
|
Ty = cast<SequentialType>(Ty)->getElementType();
|
||||||
|
|
||||||
} else if (const StructType *STy = dyn_cast<const StructType>(Ty)) {
|
} else if (const StructType *STy = dyn_cast<const StructType>(Ty)) {
|
||||||
assert(Idx[CurIDX]->getType() == Type::UByteTy && "Illegal struct idx");
|
assert(Idx[CurIDX]->getType() == Type::UByteTy && "Illegal struct idx");
|
||||||
unsigned FieldNo = cast<ConstantUInt>(Idx[CurIDX])->getValue();
|
unsigned FieldNo = cast<ConstantUInt>(Idx[CurIDX])->getValue();
|
||||||
@ -177,7 +178,7 @@ uint64_t TargetData::getIndexedOffset(const Type *ptrTy,
|
|||||||
// Add in the offset, as calculated by the structure layout info...
|
// Add in the offset, as calculated by the structure layout info...
|
||||||
assert(FieldNo < Layout->MemberOffsets.size() &&"FieldNo out of range!");
|
assert(FieldNo < Layout->MemberOffsets.size() &&"FieldNo out of range!");
|
||||||
Result += Layout->MemberOffsets[FieldNo];
|
Result += Layout->MemberOffsets[FieldNo];
|
||||||
|
|
||||||
// Update Ty to refer to current element
|
// Update Ty to refer to current element
|
||||||
Ty = STy->getElementTypes()[FieldNo];
|
Ty = STy->getElementTypes()[FieldNo];
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user