diff options
| author | Justin Lebar <jlebar@google.com> | 2016-06-15 23:20:15 +0000 |
|---|---|---|
| committer | Justin Lebar <jlebar@google.com> | 2016-06-15 23:20:15 +0000 |
| commit | c05f3c99429d620f22bc5e7c4fcbec732aeea293 (patch) | |
| tree | d443af9d2810378050e42bac40133b1adac6d760 /llvm/lib/Linker | |
| parent | 2a445cf736eeb03db9e51c7ff73616bb10c62448 (diff) | |
| download | bcm5719-llvm-c05f3c99429d620f22bc5e7c4fcbec732aeea293.tar.gz bcm5719-llvm-c05f3c99429d620f22bc5e7c4fcbec732aeea293.zip | |
[IR] [DAE] Copy comdats during DAE, and don't copy comdats in GlobalObject::copyAttributesFrom.
Summary: This reverts the changes to Globals.cpp and IRMover.cpp in
"[IR] Copy comdats in GlobalObject::copyAttributesFrom" (D20631,
rL270743).
The DeadArgElim test is left unchanged, and we change DAE to explicitly
copy comdats.
The reverted change breaks copyAttributesFrom when the destination lives
in a different module from the source. The decision in D21255 was to
revert this patch and handle comdat copying separately from
copyAttributesFrom.
Reviewers: majnemer, rnk
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D21403
llvm-svn: 272855
Diffstat (limited to 'llvm/lib/Linker')
| -rw-r--r-- | llvm/lib/Linker/IRMover.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/llvm/lib/Linker/IRMover.cpp b/llvm/lib/Linker/IRMover.cpp index 14b0a43030d..7d09b7be868 100644 --- a/llvm/lib/Linker/IRMover.cpp +++ b/llvm/lib/Linker/IRMover.cpp @@ -637,11 +637,6 @@ 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. |
