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