diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-04-28 01:08:40 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-04-28 01:08:40 +0000 |
| commit | a7b611c10d0e5fef5870d854518e639ce3d3c6be (patch) | |
| tree | a69c55ecd495ec3f044b329cd214fefb2141adb5 /lib | |
| parent | 755824756ccdc8f7b1c6f85efffdffb526461cc4 (diff) | |
| download | external_llvm-a7b611c10d0e5fef5870d854518e639ce3d3c6be.zip external_llvm-a7b611c10d0e5fef5870d854518e639ce3d3c6be.tar.gz external_llvm-a7b611c10d0e5fef5870d854518e639ce3d3c6be.tar.bz2 | |
further simplify EmitAlignment by eliminating the
ForcedAlignBits argument, tweaking the single client of it.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@102484 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 7 | ||||
| -rw-r--r-- | lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 5f8c804..aa6e2b2 100644 --- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -1154,14 +1154,11 @@ void AsmPrinter::EmitLabelOffsetDifference(const MCSymbol *Hi, uint64_t Offset, // // The algorithm is: // Align = NumBits; -// if (GV && GV->hasalignment) Align = GV->getalignment(); -// Align = std::max(Align, ForcedAlignBits); +// if (GV && GV->hasalignment) Align = GV->getAlignment(); // -void AsmPrinter::EmitAlignment(unsigned NumBits, const GlobalValue *GV, - unsigned ForcedAlignBits) const { +void AsmPrinter::EmitAlignment(unsigned NumBits, const GlobalValue *GV) const { if (GV && GV->getAlignment()) NumBits = Log2_32(GV->getAlignment()); - NumBits = std::max(NumBits, ForcedAlignBits); if (NumBits == 0) return; // No need to emit alignment. diff --git a/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp b/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp index 1c5d624..c100c59 100644 --- a/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp +++ b/lib/Target/XCore/AsmPrinter/XCoreAsmPrinter.cpp @@ -148,7 +148,7 @@ void XCoreAsmPrinter::EmitGlobalVariable(const GlobalVariable *GV) { llvm_unreachable("Unknown linkage type!"); } - EmitAlignment(Align, GV, 2); + EmitAlignment(Align > 2 ? Align : 2, GV); unsigned Size = TD->getTypeAllocSize(C->getType()); if (GV->isThreadLocal()) { |