diff options
| author | Cameron Zwarich <zwarich@apple.com> | 2011-04-13 06:03:16 +0000 |
|---|---|---|
| committer | Cameron Zwarich <zwarich@apple.com> | 2011-04-13 06:03:16 +0000 |
| commit | cdf59f70166708800e38593c1b2b97c60a9ba688 (patch) | |
| tree | d03173cdd521fcf9e20dbccff758044ad39a82ef | |
| parent | b9c9e34cb35faa7df67f73de07b0d867fa4e366a (diff) | |
| download | bcm5719-llvm-cdf59f70166708800e38593c1b2b97c60a9ba688.tar.gz bcm5719-llvm-cdf59f70166708800e38593c1b2b97c60a9ba688.zip | |
If a global variable has a specified alignment that is less than the preferred
alignment for its type, use the minimum of the specified alignment and the ABI
alignment. This fixes <rdar://problem/9275290>.
llvm-svn: 129428
| -rw-r--r-- | llvm/lib/Target/TargetData.cpp | 8 | ||||
| -rw-r--r-- | llvm/test/CodeGen/ARM/2011-04-12-AlignBug.ll | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/llvm/lib/Target/TargetData.cpp b/llvm/lib/Target/TargetData.cpp index c628df04e71..d15855ce126 100644 --- a/llvm/lib/Target/TargetData.cpp +++ b/llvm/lib/Target/TargetData.cpp @@ -617,8 +617,12 @@ uint64_t TargetData::getIndexedOffset(const Type *ptrTy, Value* const* Indices, unsigned TargetData::getPreferredAlignment(const GlobalVariable *GV) const { const Type *ElemType = GV->getType()->getElementType(); unsigned Alignment = getPrefTypeAlignment(ElemType); - if (GV->getAlignment() > Alignment) - Alignment = GV->getAlignment(); + unsigned GVAlignment = GV->getAlignment(); + if (GVAlignment >= Alignment) { + Alignment = GVAlignment; + } else if (GVAlignment != 0) { + Alignment = std::min(GVAlignment, getABITypeAlignment(ElemType)); + } if (GV->hasInitializer()) { if (Alignment < 16) { diff --git a/llvm/test/CodeGen/ARM/2011-04-12-AlignBug.ll b/llvm/test/CodeGen/ARM/2011-04-12-AlignBug.ll new file mode 100644 index 00000000000..c657b796255 --- /dev/null +++ b/llvm/test/CodeGen/ARM/2011-04-12-AlignBug.ll @@ -0,0 +1,9 @@ +; RUN: llc < %s | FileCheck %s +target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:32:64-v128:32:128-a0:0:32-n32" +target triple = "thumbv7-apple-darwin10.0.0" + +; CHECK: align 2 +@.strA = linker_private unnamed_addr constant [4 x i8] c"bar\00" +; CHECK-NOT: align +@.strB = linker_private unnamed_addr constant [4 x i8] c"foo\00", align 1 +@.strC = linker_private unnamed_addr constant [4 x i8] c"baz\00", section "__TEXT,__cstring,cstring_literals", align 1 |
