diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Analysis/ValueTracking.cpp | 2 | ||||
| -rw-r--r-- | lib/Transforms/Utils/Local.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/Analysis/ValueTracking.cpp b/lib/Analysis/ValueTracking.cpp index 8192c1471f..58adc26a1d 100644 --- a/lib/Analysis/ValueTracking.cpp +++ b/lib/Analysis/ValueTracking.cpp @@ -108,7 +108,7 @@ void llvm::ComputeMaskedBits(Value *V, const APInt &Mask, // If the object is defined in the current Module, we'll be giving // it the preferred alignment. Otherwise, we have to assume that it // may only have the minimum ABI alignment. - if (!GVar->isDeclaration() && !GVar->mayBeOverridden()) + if (!GVar->isDeclaration() && !GVar->isWeakForLinker()) Align = TD->getPreferredAlignment(GVar); else Align = TD->getABITypeAlignment(ObjectType); diff --git a/lib/Transforms/Utils/Local.cpp b/lib/Transforms/Utils/Local.cpp index 134ab71050..bbbfcba470 100644 --- a/lib/Transforms/Utils/Local.cpp +++ b/lib/Transforms/Utils/Local.cpp @@ -748,6 +748,10 @@ static unsigned enforceKnownAlignment(Value *V, unsigned Align, // If there is a large requested alignment and we can, bump up the alignment // of the global. if (GV->isDeclaration()) return Align; + // If the memory we set aside for the global may not be the memory used by + // the final program then it is impossible for us to reliably enforce the + // preferred alignment. + if (GV->isWeakForLinker()) return Align; if (GV->getAlignment() >= PrefAlign) return GV->getAlignment(); |