Alignment of globals has not been quite right. Needed to drop the pointer type
to get the alignment of the element type.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28799 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp
index b3e27c9..c5d6cb2 100644
--- a/lib/CodeGen/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter.cpp
@@ -244,18 +244,16 @@
/// specified global, returned in log form. This includes an explicitly
/// requested alignment (if the global has one).
unsigned AsmPrinter::getPreferredAlignmentLog(const GlobalVariable *GV) const {
- unsigned Alignment = TM.getTargetData()->getTypeAlignmentShift(GV->getType());
+ const Type *ElemType = GV->getType()->getElementType();
+ unsigned Alignment = TM.getTargetData()->getTypeAlignmentShift(ElemType);
if (GV->getAlignment() > (1U << Alignment))
Alignment = Log2_32(GV->getAlignment());
if (GV->hasInitializer()) {
- // Always round up alignment of global doubles to 8 bytes.
- if (GV->getType()->getElementType() == Type::DoubleTy && Alignment < 3)
- Alignment = 3;
if (Alignment < 4) {
// If the global is not external, see if it is large. If so, give it a
// larger alignment.
- if (TM.getTargetData()->getTypeSize(GV->getType()->getElementType()) > 128)
+ if (TM.getTargetData()->getTypeSize(ElemType) > 128)
Alignment = 4; // 16-byte alignment.
}
}