diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -2047,7 +2047,10 @@ continue; Symbol *sym = symtab->find(name); - if (!sym) + // If a symbol is lazy at this point, it must have been unreferenced (and + // therefore never fetched), so avoid wrapping it (which would otherwise + // create an undefined reference). + if (!sym || sym->isLazy()) continue; Symbol *real = addUnusedUndefined(saver().save("__real_" + name)); diff --git a/lld/test/ELF/wrap-lazy.test b/lld/test/ELF/wrap-lazy.test new file mode 100644 --- /dev/null +++ b/lld/test/ELF/wrap-lazy.test @@ -0,0 +1,50 @@ +# REQUIRES: x86 + +# RUN: split-file %s %t +# RUN: llvm-as %t/lazy.ll -o %tlazybitcode.o +# RUN: llvm-mc -filetype=obj -triple=x86_64-linux-gnu %t/lazy.s -o %tlazy.o +# RUN: llvm-mc -filetype=obj -triple=x86_64-linux-gnu %t/lib.s -o %tlib.o +# RUN: llvm-mc -filetype=obj -triple=x86_64-linux-gnu %t/ref.s -o %tref.o +# RUN: llvm-ar crs %tliblazybitcode.a %tlazybitcode.o +# RUN: llvm-ar crs %tliblazy.a %tlazy.o +# RUN: ld.lld -shared -o %t1.so %tlib.o %tliblazy.a --wrap lazy +# RUN: llvm-nm -D %t1.so | FileCheck --check-prefix=NO-LAZY %s +# RUN: ld.lld -shared -o %t2.so %tlib.o --start-lib %tlazy.o --wrap lazy +# RUN: llvm-nm -D %t2.so | FileCheck --check-prefix=NO-LAZY %s +# RUN: ld.lld -shared -o %t1.so %tlib.o %tliblazybitcode.a --wrap lazy +# RUN: llvm-nm -D %t1.so | FileCheck --check-prefix=NO-LAZY %s +# RUN: ld.lld -shared -o %t2.so %tlib.o --start-lib %tlazybitcode.o --wrap lazy +# RUN: llvm-nm -D %t2.so | FileCheck --check-prefix=NO-LAZY %s +# RUN: ld.lld -shared -o %t3.so %tlib.o %tliblazy.a -u lazy --wrap lazy +# RUN: llvm-nm -D %t3.so | FileCheck --check-prefix=LAZY %s +# RUN: ld.lld -shared -o %t4.so %tlib.o --start-lib %tlazy.o -u lazy --wrap lazy +# RUN: llvm-nm -D %t4.so | FileCheck --check-prefix=LAZY %s +# RUN: ld.lld -shared -o %t5.so %tlib.o %tlazy.o --wrap lazy +# RUN: llvm-nm -D %t5.so | FileCheck --check-prefix=LAZY %s +# RUN: ld.lld -shared -o %t6.so %tref.o %tliblazy.a --wrap lazy +# RUN: llvm-nm -D %t6.so | FileCheck --check-prefix=LAZY %s +# RUN: ld.lld -shared -o %t7.so %tref.o --start-lib %tlazy.o --wrap lazy +# RUN: llvm-nm -D %t7.so | FileCheck --check-prefix=LAZY %s + +## NO-LAZY-NOT: lazy +## LAZY: lazy + +#--- lazy.ll +target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" +define void @lazy() { + ret void +} + +#--- lazy.s +.globl lazy +lazy: + retq + +#--- lib.s +.globl dummy +dummy: + retq + +#--- ref.s + jmp lazy