diff options
| author | Guillaume Chatelet <gchatelet@google.com> | 2022-12-12 13:06:56 +0000 |
|---|---|---|
| committer | Guillaume Chatelet <gchatelet@google.com> | 2022-12-12 14:50:39 +0000 |
| commit | f3f15ca27fbb433ad5a65b1a1e0a071d2e9af505 (patch) | |
| tree | 7d3dbf5f2971de47edd4d4ff3807de8524566cf7 /llvm/lib/Linker/LinkModules.cpp | |
| parent | dabda23f1991f7c4e5a840ee6cf1290e18fa2e88 (diff) | |
| download | llvm-f3f15ca27fbb433ad5a65b1a1e0a071d2e9af505.zip llvm-f3f15ca27fbb433ad5a65b1a1e0a071d2e9af505.tar.gz llvm-f3f15ca27fbb433ad5a65b1a1e0a071d2e9af505.tar.bz2 | |
[Alignment][NFC] Remove deprecated GlobalObject::getAlignment
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); } |