diff options
| author | Guillaume Chatelet <gchatelet@google.com> | 2022-12-12 15:04:03 +0000 |
|---|---|---|
| committer | Guillaume Chatelet <gchatelet@google.com> | 2022-12-12 15:05:16 +0000 |
| commit | 7e10a6a606b5fea990dd523eefb6fde9107e9f44 (patch) | |
| tree | f83f9b03eb48d09028331776da6053a4bbd7e363 /llvm/lib/Linker/LinkModules.cpp | |
| parent | 58c9467f58a3ec77bae4675becfa7f3bc8470230 (diff) | |
| download | llvm-7e10a6a606b5fea990dd523eefb6fde9107e9f44.zip llvm-7e10a6a606b5fea990dd523eefb6fde9107e9f44.tar.gz llvm-7e10a6a606b5fea990dd523eefb6fde9107e9f44.tar.bz2 | |
Revert D139836 "[Alignment][NFC] Remove deprecated GlobalObject::getAlignment"
This breaks lldb.
This reverts commit f3f15ca27fbb433ad5a65b1a1e0a071d2e9af505.
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); } |