diff options
| author | Dan Gohman <gohman@apple.com> | 2010-04-02 03:04:37 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2010-04-02 03:04:37 +0000 |
| commit | f860db2398b39ed4602b595b9b352fd3f9556107 (patch) | |
| tree | c46f1b1e7a1c636246d07f7377a16114624145ec /lib | |
| parent | db8771af286bc84267e7b5bd17eab51cd4ea552f (diff) | |
Revert the recent alignment changes. They're broken for -Os because,
in particular, they end up aligning strings at 16-byte boundaries, and
there's no way for GlobalOpt to check OptForSize.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100172 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Target/TargetData.cpp | 2 | ||||
| -rw-r--r-- | lib/Transforms/IPO/GlobalOpt.cpp | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp index 652fc184bf..643b397746 100644 --- a/lib/Target/TargetData.cpp +++ b/lib/Target/TargetData.cpp @@ -651,7 +651,7 @@ unsigned TargetData::getPreferredAlignment(const GlobalVariable *GV) const { if (Alignment < 16) { // If the global is not external, see if it is large. If so, give it a // larger alignment. - if (getTypeSizeInBits(ElemType) >= 128) + if (getTypeSizeInBits(ElemType) > 128) Alignment = 16; // 16-byte alignment. } } diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp index c09e78e269..ddff5ef8b3 100644 --- a/lib/Transforms/IPO/GlobalOpt.cpp +++ b/lib/Transforms/IPO/GlobalOpt.cpp @@ -1880,7 +1880,6 @@ bool GlobalOpt::OptimizeFunctions(Module &M) { bool GlobalOpt::OptimizeGlobalVars(Module &M) { bool Changed = false; - TargetData *TD = getAnalysisIfAvailable<TargetData>(); for (Module::global_iterator GVI = M.global_begin(), E = M.global_end(); GVI != E; ) { GlobalVariable *GV = GVI++; @@ -1890,16 +1889,11 @@ bool GlobalOpt::OptimizeGlobalVars(Module &M) { // Simplify the initializer. if (GV->hasInitializer()) if (ConstantExpr *CE = dyn_cast<ConstantExpr>(GV->getInitializer())) { + TargetData *TD = getAnalysisIfAvailable<TargetData>(); Constant *New = ConstantFoldConstantExpression(CE, TD); if (New && New != CE) GV->setInitializer(New); } - // Refine the alignment value. - if (TD && GV->hasDefinitiveInitializer()) { - unsigned Align = TD->getPreferredAlignment(GV); - if (Align > GV->getAlignment()) - GV->setAlignment(Align); - } // Do more involved optimizations if the global is internal. if (!GV->isConstant() && GV->hasLocalLinkage() && GV->hasInitializer()) |