diff options
| author | Reid Kleckner <rnk@google.com> | 2016-05-25 18:36:22 +0000 |
|---|---|---|
| committer | Reid Kleckner <rnk@google.com> | 2016-05-25 18:36:22 +0000 |
| commit | c0a0363d5c269dc955c48345bf6b8e39d1c49e8b (patch) | |
| tree | fc283f4c7ead812732ad81719a43184b8775cdab /llvm/lib/Linker/IRMover.cpp | |
| parent | d8ca0522e7fb5b1f77d7a1a996c4140325a7eea6 (diff) | |
| download | bcm5719-llvm-c0a0363d5c269dc955c48345bf6b8e39d1c49e8b.tar.gz bcm5719-llvm-c0a0363d5c269dc955c48345bf6b8e39d1c49e8b.zip | |
[IR] Copy comdats in GlobalObject::copyAttributesFrom
This is probably correct for all uses except cross-module IR linking,
where we need to move the comdat from the source module to the
destination module.
Fixes PR27870.
Reviewers: majnemer
Differential Revision: http://reviews.llvm.org/D20631
llvm-svn: 270743
Diffstat (limited to 'llvm/lib/Linker/IRMover.cpp')
| -rw-r--r-- | llvm/lib/Linker/IRMover.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
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. |
