RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-01-21 01:06:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Linker] PR33527 - Linker::LinkOnlyNeeded should import AppendingLinkage globals

Browse Source 
Linker::LinkOnlyNeeded should always import globals with
AppendingLinkage.

This resolves PR33527.

Differential Revision: https://reviews.llvm.org/D34448

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@310522 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Benoit Belley 2017-08-09 20:58:39 +00:00
parent fe294dbbe4
commit bad5f185df
11 changed files with 176 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Linker/LinkModules.cpp
View File

@ -329,8 +329,18 @@ bool ModuleLinker::shouldLinkFromSource(bool &LinkFromSrc,
bool ModuleLinker::linkIfNeeded(GlobalValue &GV) {
GlobalValue *DGV = getLinkedToGlobal(&GV);
if (shouldLinkOnlyNeeded() && !(DGV && DGV->isDeclaration()))
return false;
if (shouldLinkOnlyNeeded()) {
// Always import variables with appending linkage.
if (!GV.hasAppendingLinkage()) {
// Don't import globals unless they are referenced by the destination
// module.
if (!DGV)
return false;
// Don't import globals that are already defined in the destination module
if (!DGV->isDeclaration())
return false;
}
}
if (DGV && !GV.hasLocalLinkage() && !GV.hasAppendingLinkage()) {
auto *DGVar = dyn_cast<GlobalVariable>(DGV);

7
test/Linker/Inputs/only-needed-compiler-used.ll Normal file
View File

@ -0,0 +1,7 @@
@used1 = global i8 4
@used2 = global i32 123
@llvm.compiler.used = appending global [2 x i8*] [
i8* @used1,
i8* bitcast (i32* @used2 to i8*)
], section "llvm.metadata"

20
test/Linker/Inputs/only-needed-ctors.ll Normal file
View File

@ -0,0 +1,20 @@
define internal void @ctor1() {
call void @func1()
ret void
}
define internal void @ctor2() {
ret void
}
define void @func1() {
ret void
}
define void @unused() {
ret void
}
@llvm.global_ctors = appending global[2 x{i32, void() *, i8 * }] [
{i32, void() *, i8 * } { i32 2, void() *@ctor1, i8 *null},
{i32, void() *, i8 * } { i32 7, void() *@ctor2, i8 *null}]

20
test/Linker/Inputs/only-needed-dtors.ll Normal file
View File

@ -0,0 +1,20 @@
define internal void @dtor1() {
call void @func1()
ret void
}
define internal void @dtor2() {
ret void
}
define void @func1() {
ret void
}
define void @unused() {
ret void
}
@llvm.global_dtors = appending global[2 x{i32, void() *, i8 * }] [
{i32, void() *, i8 * } { i32 2, void() *@dtor1, i8 *null},
{i32, void() *, i8 * } { i32 7, void() *@dtor2, i8 *null}]

7
test/Linker/Inputs/only-needed-used.ll Normal file
View File

@ -0,0 +1,7 @@
@used1 = global i8 4
@used2 = global i32 123
@llvm.used = appending global [2 x i8*] [
i8* @used1,
i8* bitcast (i32* @used2 to i8*)
], section "llvm.metadata"

13
test/Linker/only-needed-compiler-used.ll Normal file
View File

@ -0,0 +1,13 @@
; RUN: llvm-link -S %s %p/Inputs/only-needed-compiler-used.ll | FileCheck %s --check-prefix=CHECK --check-prefix=NO-INTERNALIZE
; RUN: llvm-link -S -internalize %s %p/Inputs/only-needed-compiler-used.ll | FileCheck %s --check-prefix=CHECK --check-prefix=INTERNALIZE
; RUN: llvm-link -S -only-needed %s %p/Inputs/only-needed-compiler-used.ll | FileCheck %s --check-prefix=CHECK --check-prefix=NO-INTERNALIZE
; RUN: llvm-link -S -only-needed -internalize %s %p/Inputs/only-needed-compiler-used.ll | FileCheck %s --check-prefix=CHECK --check-prefix=INTERNALIZE
; Empty destination module!
; CHECK-DAG: @llvm.compiler.used = appending global [2 x i8*] [i8* @used1, i8* bitcast (i32* @used2 to i8*)], section "llvm.metadata"
; NO-INTERNALIZE-DAG: @used1 = global i8 4
; INTERNALIZE-DAG: @used1 = internal global i8 4
; NO-INTERNALIZE-DAG: @used2 = global i32 123
; INTERNALIZE-DAG: @used2 = internal global i32 123

15
test/Linker/only-needed-ctors1.ll Normal file
View File

@ -0,0 +1,15 @@
; RUN: llvm-link -S %s %p/Inputs/only-needed-ctors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=LINK-ALL --check-prefix=NO-INTERNALIZE
; RUN: llvm-link -S -internalize %s %p/Inputs/only-needed-ctors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=LINK_ALL --check-prefix=INTERNALIZE
; RUN: llvm-link -S -only-needed %s %p/Inputs/only-needed-ctors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=ONLY-NEEDED --check-prefix=NO-INTERNALIZE
; RUN: llvm-link -S -only-needed -internalize %s %p/Inputs/only-needed-ctors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=ONLY-NEEDED --check-prefix=INTERNALIZE
; Empty destination module!
; CHECK: @llvm.global_ctors = appending global [2 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 2, void ()* @ctor1, i8* null }, { i32, void ()*, i8* } { i32 7, void ()* @ctor2, i8* null }]
; CHECK: define internal void @ctor1()
; CHECK: define internal void @ctor2()
; NO-INTERNALIZE: define void @func1()
; INTERNALIZE: define internal void @func1()
; LINK-ALL: define {{(internal )?}}void @unused()
; ONLY-NEEDED-NOT: void @unused()

28
test/Linker/only-needed-ctors2.ll Normal file
View File

@ -0,0 +1,28 @@
; RUN: llvm-link -S %s %p/Inputs/only-needed-ctors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=LINK-ALL --check-prefix=NO-INTERNALIZE
; RUN: llvm-link -S -internalize %s %p/Inputs/only-needed-ctors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=LINK_ALL --check-prefix=INTERNALIZE
; RUN: llvm-link -S -only-needed %s %p/Inputs/only-needed-ctors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=ONLY-NEEDED --check-prefix=NO-INTERNALIZE
; RUN: llvm-link -S -only-needed -internalize %s %p/Inputs/only-needed-ctors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=ONLY-NEEDED --check-prefix=INTERNALIZE
; Destination module:
define void @foo() {
ret void
}
define internal void @ctor1() {
ret void
}
@llvm.global_ctors = appending global[1 x{i32, void() *, i8 * }] [
{i32, void() *, i8 * } { i32 4, void() *@ctor1, i8 *null}]
; CHECK: @llvm.global_ctors = appending global [3 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 4, void ()* @ctor1, i8* null }, { i32, void ()*, i8* } { i32 2, void ()* @ctor1.2, i8* null }, { i32, void ()*, i8* } { i32 7, void ()* @ctor2, i8* null }]
; CHECK: define internal void @ctor1()
; CHECK: define void @foo()
; CHECK: define internal void @ctor1.{{[0-9]+}}()
; CHECK: define internal void @ctor2()
; NO-INTERNALIZE: define void @func1()
; INTERNALIZE: define internal void @func1()
; LINK-ALL: define {{(internal )?}}void @unused()
; ONLY-NEEDED-NOT: void @unused()

15
test/Linker/only-needed-dtors1.ll Normal file
View File

@ -0,0 +1,15 @@
; RUN: llvm-link -S %s %p/Inputs/only-needed-dtors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=LINK-ALL --check-prefix=NO-INTERNALIZE
; RUN: llvm-link -S -internalize %s %p/Inputs/only-needed-dtors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=LINK_ALL --check-prefix=INTERNALIZE
; RUN: llvm-link -S -only-needed %s %p/Inputs/only-needed-dtors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=ONLY-NEEDED --check-prefix=NO-INTERNALIZE
; RUN: llvm-link -S -only-needed -internalize %s %p/Inputs/only-needed-dtors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=ONLY-NEEDED --check-prefix=INTERNALIZE
; Empty destination module!
; CHECK: @llvm.global_dtors = appending global [2 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 2, void ()* @dtor1, i8* null }, { i32, void ()*, i8* } { i32 7, void ()* @dtor2, i8* null }]
; CHECK: define internal void @dtor1()
; CHECK: define internal void @dtor2()
; NO-INTERNALIZE: define void @func1()
; INTERNALIZE: define internal void @func1()
; LINK-ALL: define {{(internal )?}}void @unused()
; ONLY-NEEDED-NOT: void @unused()

28
test/Linker/only-needed-dtors2.ll Normal file
View File

@ -0,0 +1,28 @@
; RUN: llvm-link -S %s %p/Inputs/only-needed-dtors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=LINK-ALL --check-prefix=NO-INTERNALIZE
; RUN: llvm-link -S -internalize %s %p/Inputs/only-needed-dtors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=LINK_ALL --check-prefix=INTERNALIZE
; RUN: llvm-link -S -only-needed %s %p/Inputs/only-needed-dtors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=ONLY-NEEDED --check-prefix=NO-INTERNALIZE
; RUN: llvm-link -S -only-needed -internalize %s %p/Inputs/only-needed-dtors.ll | FileCheck %s --check-prefix=CHECK --check-prefix=ONLY-NEEDED --check-prefix=INTERNALIZE
; Destination module:
define void @foo() {
ret void
}
define internal void @dtor1() {
ret void
}
@llvm.global_dtors = appending global[1 x{i32, void() *, i8 * }] [
{i32, void() *, i8 * } { i32 4, void() *@dtor1, i8 *null}]
; CHECK: @llvm.global_dtors = appending global [3 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 4, void ()* @dtor1, i8* null }, { i32, void ()*, i8* } { i32 2, void ()* @dtor1.2, i8* null }, { i32, void ()*, i8* } { i32 7, void ()* @dtor2, i8* null }]
; CHECK: define internal void @dtor1()
; CHECK: define void @foo()
; CHECK: define internal void @dtor1.{{[0-9]+}}()
; CHECK: define internal void @dtor2()
; NO-INTERNALIZE: define void @func1()
; INTERNALIZE: define internal void @func1()
; LINK-ALL: define {{(internal )?}}void @unused()
; ONLY-NEEDED-NOT: void @unused()

11
test/Linker/only-needed-used.ll Normal file
View File

@ -0,0 +1,11 @@
; RUN: llvm-link -S %s %p/Inputs/only-needed-used.ll | FileCheck %s
; RUN: llvm-link -S -internalize %s %p/Inputs/only-needed-used.ll | FileCheck %s
; RUN: llvm-link -S -only-needed %s %p/Inputs/only-needed-used.ll | FileCheck %s
; RUN: llvm-link -S -only-needed -internalize %s %p/Inputs/only-needed-used.ll | FileCheck %s
; Empty destination module!
; CHECK-DAG: @llvm.used = appending global [2 x i8*] [i8* @used1, i8* bitcast (i32* @used2 to i8*)], section "llvm.metadata"
; CHECK-DAG: @used1 = global i8 4
; CHECK-DAG: @used2 = global i32 123