mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-15 21:24:00 +00:00
Adjust to the changed StructType interface. In particular, getElementTypes() is gone.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11228 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -241,7 +241,7 @@ namespace {
|
||||
StackState &SS = Stack.back();
|
||||
if (const StructType *ST = dyn_cast<StructType>(SS.Ty)) {
|
||||
++SS.Idx;
|
||||
if (SS.Idx != ST->getElementTypes().size()) {
|
||||
if (SS.Idx != ST->getNumElements()) {
|
||||
const StructLayout *SL = TD.getStructLayout(ST);
|
||||
SS.Offset += SL->MemberOffsets[SS.Idx]-SL->MemberOffsets[SS.Idx-1];
|
||||
return;
|
||||
@ -266,14 +266,14 @@ namespace {
|
||||
while (!Stack.empty() && !Stack.back().Ty->isFirstClassType()) {
|
||||
StackState &SS = Stack.back();
|
||||
if (const StructType *ST = dyn_cast<StructType>(SS.Ty)) {
|
||||
if (ST->getElementTypes().empty()) {
|
||||
if (ST->getNumElements() == 0) {
|
||||
assert(SS.Idx == 0);
|
||||
PopStackAndAdvance();
|
||||
} else {
|
||||
// Step into the structure...
|
||||
assert(SS.Idx < ST->getElementTypes().size());
|
||||
assert(SS.Idx < ST->getNumElements());
|
||||
const StructLayout *SL = TD.getStructLayout(ST);
|
||||
Stack.push_back(StackState(ST->getElementTypes()[SS.Idx],
|
||||
Stack.push_back(StackState(ST->getElementType(SS.Idx),
|
||||
SS.Offset+SL->MemberOffsets[SS.Idx]));
|
||||
}
|
||||
} else {
|
||||
@ -443,7 +443,7 @@ bool DSNode::mergeTypeInfo(const Type *NewTy, unsigned Offset,
|
||||
/* empty */;
|
||||
|
||||
// The offset we are looking for must be in the i'th element...
|
||||
SubType = STy->getElementTypes()[i];
|
||||
SubType = STy->getElementType(i);
|
||||
O += SL.MemberOffsets[i];
|
||||
break;
|
||||
}
|
||||
@ -496,7 +496,7 @@ bool DSNode::mergeTypeInfo(const Type *NewTy, unsigned Offset,
|
||||
NextPadSize = SL.MemberOffsets[1];
|
||||
else
|
||||
NextPadSize = SubTypeSize;
|
||||
NextSubType = STy->getElementTypes()[0];
|
||||
NextSubType = STy->getElementType(0);
|
||||
NextSubTypeSize = TD.getTypeSize(NextSubType);
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user