diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Linker/LinkModules.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/Linker/Inputs/available_externally_over_decl.ll | 5 | ||||
| -rw-r--r-- | llvm/test/Linker/available_externally_over_decl.ll | 9 |
3 files changed, 20 insertions, 1 deletions
diff --git a/llvm/lib/Linker/LinkModules.cpp b/llvm/lib/Linker/LinkModules.cpp index a9fcee7c98c..3d40c126dd2 100644 --- a/llvm/lib/Linker/LinkModules.cpp +++ b/llvm/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/llvm/test/Linker/Inputs/available_externally_over_decl.ll b/llvm/test/Linker/Inputs/available_externally_over_decl.ll new file mode 100644 index 00000000000..b440fde9214 --- /dev/null +++ b/llvm/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/llvm/test/Linker/available_externally_over_decl.ll b/llvm/test/Linker/available_externally_over_decl.ll new file mode 100644 index 00000000000..e220b17edf7 --- /dev/null +++ b/llvm/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() { |
