[llvm-commits] CVS: llvm/lib/CodeGen/AsmPrinter.cpp

[Jim Laskey]

Changes in directory llvm/lib/CodeGen:

AsmPrinter.cpp updated: 1.80 -> 1.81
---
Log message:

Alignment of globals has not been quite right.  Needed to drop the pointer type
to get the alignment of the element type.


---
Diffs of the changes:  (+3 -5)

 AsmPrinter.cpp |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)


Index: llvm/lib/CodeGen/AsmPrinter.cpp
diff -u llvm/lib/CodeGen/AsmPrinter.cpp:1.80 llvm/lib/CodeGen/AsmPrinter.cpp:1.81
--- llvm/lib/CodeGen/AsmPrinter.cpp:1.80	Thu Jun 15 03:10:56 2006
+++ llvm/lib/CodeGen/AsmPrinter.cpp	Thu Jun 15 08:10:58 2006
@@ -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.
     }
   }