From 19f5469be4af517aa7953988a6d2e92cc05d4c62 Mon Sep 17 00:00:00 2001 From: Dale Johannesen Date: Mon, 23 Apr 2007 19:58:54 +0000 Subject: [PATCH] make EmitAlignment work the way Chris says it should git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36368 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/CodeGen/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter.cpp index 4dce674575c..1266179a2cd 100644 --- a/lib/CodeGen/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter.cpp @@ -579,8 +579,10 @@ void AsmPrinter::EmitString(const std::string &String) const { //===----------------------------------------------------------------------===// // EmitAlignment - Emit an alignment directive to the specified power of two. +// Use the maximum of the specified alignment and the alignment from the +// specified GlobalValue (if any). void AsmPrinter::EmitAlignment(unsigned NumBits, const GlobalValue *GV) const { - if (GV && GV->getAlignment()) + if (GV && GV->getAlignment() && Log2_32(GV->getAlignment()) > NumBits) NumBits = Log2_32(GV->getAlignment()); if (NumBits == 0) return; // No need to emit alignment. if (TAI->getAlignmentIsInBytes()) NumBits = 1 << NumBits;