diff options
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/IR/Globals.cpp | 1 | ||||
| -rw-r--r-- | llvm/lib/Linker/IRMover.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/llvm/lib/IR/Globals.cpp b/llvm/lib/IR/Globals.cpp index 7e8ef6526fc..3bf3cc25455 100644 --- a/llvm/lib/IR/Globals.cpp +++ b/llvm/lib/IR/Globals.cpp @@ -96,6 +96,7 @@ void GlobalObject::copyAttributesFrom(const GlobalValue *Src) { if (const auto *GV = dyn_cast<GlobalObject>(Src)) { setAlignment(GV->getAlignment()); setSection(GV->getSection()); + setComdat(const_cast<GlobalObject *>(GV)->getComdat()); } } diff --git a/llvm/lib/Linker/IRMover.cpp b/llvm/lib/Linker/IRMover.cpp index 0d37ad1c657..9a2cedfc59e 100644 --- a/llvm/lib/Linker/IRMover.cpp +++ b/llvm/lib/Linker/IRMover.cpp @@ -622,6 +622,11 @@ GlobalValue *IRLinker::copyGlobalValueProto(const GlobalValue *SGV, NewGV->copyAttributesFrom(SGV); + // Don't copy the comdat, it's from the original module. We'll handle it + // later. + if (auto *NewGO = dyn_cast<GlobalObject>(NewGV)) + NewGO->setComdat(nullptr); + // Remove these copied constants in case this stays a declaration, since // they point to the source module. If the def is linked the values will // be mapped in during linkFunctionBody. |
