From b1a9ad81c5d4850acd5429b03f59c4e7b6fe3466 Mon Sep 17 00:00:00 2001 From: Benoit Belley Date: Wed, 9 Aug 2017 20:58:39 +0000 Subject: [Linker] PR33527 - Linker::LinkOnlyNeeded should import AppendingLinkage globals Linker::LinkOnlyNeeded should always import globals with AppendingLinkage. This resolves PR33527. Differential Revision: https://reviews.llvm.org/D34448 llvm-svn: 310522 --- .../Linker/Inputs/only-needed-compiler-used.ll | 7 ++++++ llvm/test/Linker/Inputs/only-needed-ctors.ll | 20 ++++++++++++++++ llvm/test/Linker/Inputs/only-needed-dtors.ll | 20 ++++++++++++++++ llvm/test/Linker/Inputs/only-needed-used.ll | 7 ++++++ llvm/test/Linker/only-needed-compiler-used.ll | 13 ++++++++++ llvm/test/Linker/only-needed-ctors1.ll | 15 ++++++++++++ llvm/test/Linker/only-needed-ctors2.ll | 28 ++++++++++++++++++++++ llvm/test/Linker/only-needed-dtors1.ll | 15 ++++++++++++ llvm/test/Linker/only-needed-dtors2.ll | 28 ++++++++++++++++++++++ llvm/test/Linker/only-needed-used.ll | 11 +++++++++ 10 files changed, 164 insertions(+) create mode 100644 llvm/test/Linker/Inputs/only-needed-compiler-used.ll create mode 100644 llvm/test/Linker/Inputs/only-needed-ctors.ll create mode 100644 llvm/test/Linker/Inputs/only-needed-dtors.ll create mode 100644 llvm/test/Linker/Inputs/only-needed-used.ll create mode 100644 llvm/test/Linker/only-needed-compiler-used.ll create mode 100644 llvm/test/Linker/only-needed-ctors1.ll create mode 100644 llvm/test/Linker/only-needed-ctors2.ll create mode 100644 llvm/test/Linker/only-needed-dtors1.ll create mode 100644 llvm/test/Linker/only-needed-dtors2.ll create mode 100644 llvm/test/Linker/only-needed-used.ll (limited to 'llvm/test') diff --git a/llvm/test/Linker/Inputs/only-needed-compiler-used.ll b/llvm/test/Linker/Inputs/only-needed-compiler-used.ll new file mode 100644 index 00000000000..6e837aa1021 --- /dev/null +++ b/llvm/test/Linker/Inputs/only-needed-compiler-used.ll @@ -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" diff --git a/llvm/test/Linker/Inputs/only-needed-ctors.ll b/llvm/test/Linker/Inputs/only-needed-ctors.ll new file mode 100644 index 00000000000..d95f3711ef5 --- /dev/null +++ b/llvm/test/Linker/Inputs/only-needed-ctors.ll @@ -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}] diff --git a/llvm/test/Linker/Inputs/only-needed-dtors.ll b/llvm/test/Linker/Inputs/only-needed-dtors.ll new file mode 100644 index 00000000000..31aaf7bb74e --- /dev/null +++ b/llvm/test/Linker/Inputs/only-needed-dtors.ll @@ -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}] diff --git a/llvm/test/Linker/Inputs/only-needed-used.ll b/llvm/test/Linker/Inputs/only-needed-used.ll new file mode 100644 index 00000000000..9387a13d728 --- /dev/null +++ b/llvm/test/Linker/Inputs/only-needed-used.ll @@ -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" diff --git a/llvm/test/Linker/only-needed-compiler-used.ll b/llvm/test/Linker/only-needed-compiler-used.ll new file mode 100644 index 00000000000..b15178bda78 --- /dev/null +++ b/llvm/test/Linker/only-needed-compiler-used.ll @@ -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 diff --git a/llvm/test/Linker/only-needed-ctors1.ll b/llvm/test/Linker/only-needed-ctors1.ll new file mode 100644 index 00000000000..fbc5683fba7 --- /dev/null +++ b/llvm/test/Linker/only-needed-ctors1.ll @@ -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() diff --git a/llvm/test/Linker/only-needed-ctors2.ll b/llvm/test/Linker/only-needed-ctors2.ll new file mode 100644 index 00000000000..018cfc87420 --- /dev/null +++ b/llvm/test/Linker/only-needed-ctors2.ll @@ -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() diff --git a/llvm/test/Linker/only-needed-dtors1.ll b/llvm/test/Linker/only-needed-dtors1.ll new file mode 100644 index 00000000000..5f16ffc268d --- /dev/null +++ b/llvm/test/Linker/only-needed-dtors1.ll @@ -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() diff --git a/llvm/test/Linker/only-needed-dtors2.ll b/llvm/test/Linker/only-needed-dtors2.ll new file mode 100644 index 00000000000..ece442b0d31 --- /dev/null +++ b/llvm/test/Linker/only-needed-dtors2.ll @@ -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() diff --git a/llvm/test/Linker/only-needed-used.ll b/llvm/test/Linker/only-needed-used.ll new file mode 100644 index 00000000000..7eff3b5db66 --- /dev/null +++ b/llvm/test/Linker/only-needed-used.ll @@ -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 -- cgit v1.2.3