diff options
| author | Guillaume Chatelet <gchatelet@google.com> | 2022-12-12 16:37:51 +0000 |
|---|---|---|
| committer | Guillaume Chatelet <gchatelet@google.com> | 2022-12-12 16:38:18 +0000 |
| commit | 3bbfaee23d41c099547c652f87b252ab6e1f6c46 (patch) | |
| tree | 58824c49cb66eabbfce741129704f562fb3f6110 /llvm/lib/Linker/LinkModules.cpp | |
| parent | 56fd846f370adf16bea333b12637038ea2f3c225 (diff) | |
| download | llvm-3bbfaee23d41c099547c652f87b252ab6e1f6c46.zip llvm-3bbfaee23d41c099547c652f87b252ab6e1f6c46.tar.gz llvm-3bbfaee23d41c099547c652f87b252ab6e1f6c46.tar.bz2 | |
[reland][Alignment][NFC] Remove access to deprecated GlobalObject::getAlignment from llvm
Differential Revision: https://reviews.llvm.org/D139836
Diffstat (limited to 'llvm/lib/Linker/LinkModules.cpp')
| -rw-r--r-- | llvm/lib/Linker/LinkModules.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp index 17c3f09..2f5fac4 100644 --- a/llvm/lib/Linker/LinkModules.cpp +++ b/llvm/lib/Linker/LinkModules.cpp @@ -352,8 +352,12 @@ bool ModuleLinker::linkIfNeeded(GlobalValue &GV, SGVar->setConstant(false); } if (DGVar->hasCommonLinkage() && SGVar->hasCommonLinkage()) { - MaybeAlign Align( - std::max(DGVar->getAlignment(), SGVar->getAlignment())); + MaybeAlign DAlign = DGVar->getAlign(); + MaybeAlign SAlign = SGVar->getAlign(); + MaybeAlign Align = std::nullopt; + if (DAlign || SAlign) + Align = std::max(DAlign.valueOrOne(), SAlign.valueOrOne()); + SGVar->setAlignment(Align); DGVar->setAlignment(Align); } |