diff options
author | Eli Friedman <eli.friedman@gmail.com> | 2011-11-30 21:54:15 +0000 |
---|---|---|
committer | Eli Friedman <eli.friedman@gmail.com> | 2011-11-30 21:54:15 +0000 |
commit | 6cff9df2984bd52b455023f5841289c6cfafed6e (patch) | |
tree | 4947a6021936a784dc32fc8fe6a890c4232e4151 /llvm/lib/Transforms | |
parent | ad8b58b2ac96b94b3cbd6afedfcd6a5c66fd3f06 (diff) | |
download | bcm5719-llvm-6cff9df2984bd52b455023f5841289c6cfafed6e.tar.gz bcm5719-llvm-6cff9df2984bd52b455023f5841289c6cfafed6e.zip |
Make GlobalMerge honor the preferred alignment on globals without an explicitly specified alignment.
<rdar://problem/10497732>.
llvm-svn: 145523
Diffstat (limited to 'llvm/lib/Transforms')
-rw-r--r-- | llvm/lib/Transforms/Scalar/GlobalMerge.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Transforms/Scalar/GlobalMerge.cpp b/llvm/lib/Transforms/Scalar/GlobalMerge.cpp index 0772b487293..ad8689ab2bc 100644 --- a/llvm/lib/Transforms/Scalar/GlobalMerge.cpp +++ b/llvm/lib/Transforms/Scalar/GlobalMerge.cpp @@ -182,7 +182,7 @@ bool GlobalMerge::doInitialization(Module &M) { continue; // Ignore fancy-aligned globals for now. - unsigned Alignment = I->getAlignment(); + unsigned Alignment = TD->getPreferredAlignment(I); Type *Ty = I->getType()->getElementType(); if (Alignment > TD->getABITypeAlignment(Ty)) continue; |