diff options
| author | Cameron Zwarich <zwarich@apple.com> | 2011-04-13 09:02:43 +0000 |
|---|---|---|
| committer | Cameron Zwarich <zwarich@apple.com> | 2011-04-13 09:02:43 +0000 |
| commit | 70be27e913a4c71ecba76d1a8cf8503b4a98cb3f (patch) | |
| tree | c006514db6a14dc45a849a58ff653a65307d7db2 /llvm/lib/Target/TargetData.cpp | |
| parent | 0a7aa3b60b234d272bb7f7d468aca54e93b8c626 (diff) | |
| download | bcm5719-llvm-70be27e913a4c71ecba76d1a8cf8503b4a98cb3f.tar.gz bcm5719-llvm-70be27e913a4c71ecba76d1a8cf8503b4a98cb3f.zip | |
Fix an obvious problem with an alignment computation. AsmPrinter actually does
the max itself, so it is not easy to write a test case for this, but I added a
test case that would fail if the code in AsmPrinter were removed.
llvm-svn: 129432
Diffstat (limited to 'llvm/lib/Target/TargetData.cpp')
| -rw-r--r-- | llvm/lib/Target/TargetData.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/TargetData.cpp b/llvm/lib/Target/TargetData.cpp index d15855ce126..da956d5fed9 100644 --- a/llvm/lib/Target/TargetData.cpp +++ b/llvm/lib/Target/TargetData.cpp @@ -621,7 +621,7 @@ unsigned TargetData::getPreferredAlignment(const GlobalVariable *GV) const { if (GVAlignment >= Alignment) { Alignment = GVAlignment; } else if (GVAlignment != 0) { - Alignment = std::min(GVAlignment, getABITypeAlignment(ElemType)); + Alignment = std::max(GVAlignment, getABITypeAlignment(ElemType)); } if (GV->hasInitializer()) { |
