RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-25 12:29:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix another case where we were unconditionally linking linkonce GVs.

Browse Source 
With this I think that now llvm-link,  lld and the gold plugin should
agree on which symbol is kept.

llvm-svn: 264292
This commit is contained in:
Rafael Espindola 2016-03-24 15:23:01 +00:00
parent e439221531
commit 832680bbb5
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Linker/LinkModules.cpp
View File

@ -447,6 +447,12 @@ void ModuleLinker::addLazyFor(GlobalValue &GV, IRMover::ValueAdder Add) {
if (!SC)
return;
for (GlobalValue *GV2 : LazyComdatMembers[SC]) {
GlobalValue *DGV = getLinkedToGlobal(GV2);
bool LinkFromSrc = true;
if (DGV && shouldLinkFromSource(LinkFromSrc, *DGV, *GV2))
return;
if (!LinkFromSrc)
continue;
if (shouldInternalizeLinkedSymbols())
Internalize.insert(GV2->getName());
Add(*GV2);

12
test/Linker/Inputs/pr27044.ll
View File

@ -1,7 +1,19 @@
$foo = comdat any
$bar = comdat any
define linkonce_odr i32 @f1() comdat($foo) {
ret i32 1
}
define void @f2() comdat($foo) {
call i32 @g2()
ret void
}
define linkonce_odr i32 @g1() comdat($bar) {
ret i32 1
}
define linkonce_odr i32 @g2() comdat($bar) {
ret i32 1
}

6
test/Linker/pr27044.ll
View File

@ -1,8 +1,14 @@
; RUN: llvm-link -S %s %p/Inputs/pr27044.ll -o - | FileCheck %s
; CHECK: define i32 @f1() {
; CHECK: define i32 @g1() {
; CHECK: define void @f2() comdat($foo) {
; CHECK: define linkonce_odr i32 @g2() comdat($bar) {
define i32 @f1() {
ret i32 0
}
define i32 @g1() {
ret i32 0
}