diff options
| author | Cameron Zwarich <zwarich@apple.com> | 2011-07-11 01:29:42 +0000 |
|---|---|---|
| committer | Cameron Zwarich <zwarich@apple.com> | 2011-07-11 01:29:42 +0000 |
| commit | 776403b6429422c7460bee93e617cb8c1cb3f021 (patch) | |
| tree | acf779245f620a77f665c46bb5a8069845ac6496 /llvm/lib/Target/ARM/ARMGlobalMerge.cpp | |
| parent | 944e502cb4877d996a0be9a4e556ff84401b6dfc (diff) | |
| download | llvm-776403b6429422c7460bee93e617cb8c1cb3f021.zip llvm-776403b6429422c7460bee93e617cb8c1cb3f021.tar.gz llvm-776403b6429422c7460bee93e617cb8c1cb3f021.tar.bz2 | |
Fix <rdar://problem/9751331>.
llvm-svn: 134882
Diffstat (limited to 'llvm/lib/Target/ARM/ARMGlobalMerge.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/ARMGlobalMerge.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/llvm/lib/Target/ARM/ARMGlobalMerge.cpp b/llvm/lib/Target/ARM/ARMGlobalMerge.cpp index 4bdd4f1..f899379 100644 --- a/llvm/lib/Target/ARM/ARMGlobalMerge.cpp +++ b/llvm/lib/Target/ARM/ARMGlobalMerge.cpp @@ -176,8 +176,8 @@ bool ARMGlobalMerge::doInitialization(Module &M) { // Ignore fancy-aligned globals for now. unsigned Alignment = I->getAlignment(); - unsigned AllocSize = TD->getTypeAllocSize(I->getType()->getElementType()); - if (Alignment > AllocSize) + const Type *Ty = I->getType()->getElementType(); + if (Alignment > TD->getABITypeAlignment(Ty)) continue; // Ignore all 'special' globals. @@ -185,7 +185,7 @@ bool ARMGlobalMerge::doInitialization(Module &M) { I->getName().startswith(".llvm.")) continue; - if (AllocSize < MaxOffset) { + if (TD->getTypeAllocSize(Ty) < MaxOffset) { const TargetLoweringObjectFile &TLOF = TLI->getObjFileLowering(); if (TLOF.getKindForGlobal(I, TLI->getTargetMachine()).isBSSLocal()) BSSGlobals.push_back(I); |