Handle targets where alignment can be bigger than the size of the data.
Contributed by Vladimir Prus!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14534 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp
index caa66fe..59ef5ac 100644
--- a/lib/Target/TargetData.cpp
+++ b/lib/Target/TargetData.cpp
@@ -168,19 +168,19 @@
Size = TD->getPointerSize(); Alignment = TD->getPointerAlignment();
return;
case Type::ArrayTyID: {
- const ArrayType *ATy = (const ArrayType *)Ty;
+ const ArrayType *ATy = cast<ArrayType>(Ty);
+ unsigned AlignedSize = (Size + Alignment - 1)/Alignment*Alignment;
getTypeInfo(ATy->getElementType(), TD, Size, Alignment);
- Size *= ATy->getNumElements();
+ Size = AlignedSize*ATy->getNumElements();
return;
}
case Type::StructTyID: {
// Get the layout annotation... which is lazily created on demand.
- const StructLayout *Layout = TD->getStructLayout((const StructType*)Ty);
+ const StructLayout *Layout = TD->getStructLayout(cast<StructType>(Ty));
Size = Layout->StructSize; Alignment = Layout->StructAlignment;
return;
}
- case Type::TypeTyID:
default:
assert(0 && "Bad type for getTypeInfo!!!");
return;