From fad81ab170b3d422f0aaa15b88157fdb16d3e75d Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 9 Dec 2015 22:44:00 +0000 Subject: [PATCH 1/1] Synchronize the logic for deciding to link a gv. We were deciding to not link an available_externally gv over a declaration, but then copying over the body anyway. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@255169 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Linker/LinkModules.cpp | 7 ++++++- test/Linker/Inputs/available_externally_over_decl.ll | 5 +++++ test/Linker/available_externally_over_decl.ll | 9 +++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 test/Linker/Inputs/available_externally_over_decl.ll create mode 100644 test/Linker/available_externally_over_decl.ll diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp index a9fcee7c98c..3d40c126dd2 100644 --- a/lib/Linker/LinkModules.cpp +++ b/lib/Linker/LinkModules.cpp @@ -1050,7 +1050,12 @@ bool ModuleLinker::shouldLinkFromSource(bool &LinkFromSrc, return false; } // If the Dest is weak, use the source linkage. - LinkFromSrc = Dest.hasExternalWeakLinkage(); + if (Dest.hasExternalWeakLinkage()) { + LinkFromSrc = true; + return false; + } + // Link an available_externally over a declaration. + LinkFromSrc = !Src.isDeclaration() && Dest.isDeclaration(); return false; } diff --git a/test/Linker/Inputs/available_externally_over_decl.ll b/test/Linker/Inputs/available_externally_over_decl.ll new file mode 100644 index 00000000000..b440fde9214 --- /dev/null +++ b/test/Linker/Inputs/available_externally_over_decl.ll @@ -0,0 +1,5 @@ +@h = global void ()* @f + +define available_externally void @f() { + ret void +} diff --git a/test/Linker/available_externally_over_decl.ll b/test/Linker/available_externally_over_decl.ll new file mode 100644 index 00000000000..e220b17edf7 --- /dev/null +++ b/test/Linker/available_externally_over_decl.ll @@ -0,0 +1,9 @@ +; RUN: llvm-link -S %s %p/Inputs/available_externally_over_decl.ll | FileCheck %s + +declare void @f() + +define void ()* @main() { + ret void ()* @f +} + +; CHECK: define available_externally void @f() { -- 2.34.1