[PATCH] D66239: [LLD][COFF] Add index to disambiguate archive members when using -wholearchive

[Markus Böck via Phabricator via llvm-commits]

zero9178 created this revision.
zero9178 added a reviewer: ruiu.
Herald added subscribers: llvm-commits, arphaman, dexonsmith, steven_wu, mehdi_amini.
Herald added a project: LLVM.

PR42951:
When linking an archive with members that have the same name linking fails when using the -wholearchive option. This patch passes the index of the member in the archive to the offset parameter to disambiguate the member.


Repository:
  rLLD LLVM Linker

https://reviews.llvm.org/D66239

Files:
  COFF/Driver.cpp
  test/COFF/thinlto-whole-archives.ll


Index: test/COFF/thinlto-whole-archives.ll
===================================================================
--- test/COFF/thinlto-whole-archives.ll
+++ test/COFF/thinlto-whole-archives.ll
@@ -0,0 +1,31 @@
+; REQUIRES: x86
+; RUN: rm -fr %T/thinlto-whole-archives
+; RUN: mkdir %T/thinlto-whole-archives %T/thinlto-whole-archives/a %T/thinlto-whole-archives/b
+; RUN: opt -thinlto-bc -o %T/thinlto-whole-archives/main.obj %s
+; RUN: opt -thinlto-bc -o %T/thinlto-whole-archives/a/bar.obj %S/Inputs/lto-dep.ll
+; RUN: opt -thinlto-bc -o %T/thinlto-whole-archives/b/bar.obj %S/Inputs/bar.ll
+; RUN: llvm-ar crs %T/thinlto-whole-archives/a.lib %T/thinlto-whole-archives/a/bar.obj
+; RUN: llvm-ar crs %T/thinlto-whole-archives/b.lib %T/thinlto-whole-archives/b/bar.obj
+; RUN: lld-link -out:%T/thinlto-whole-archives/main.exe -entry:main \
+; RUN:     -wholearchive -lldsavetemps -subsystem:console %T/thinlto-whole-archives/main.obj \
+; RUN:     %T/thinlto-whole-archives/a.lib %T/thinlto-whole-archives/b.lib
+; RUN: FileCheck %s < %T/thinlto-whole-archives/main.exe.resolution.txt
+
+; CHECK: {{/thinlto-whole-archives/main.obj$}}
+; CHECK: {{^-r=.*/thinlto-whole-archives/main.obj,main,px$}}
+; CHECK: {{/thinlto-whole-archives/a.libbar.obj[0-9]+$}}
+; CHECK-NEXT: {{^-r=.*/thinlto-whole-archives/a.libbar.obj[0-9]+,foo,p$}}
+; CHECK-NEXT: {{/thinlto-whole-archives/b.libbar.obj[0-9]+$}}
+; CHECK-NEXT: {{^-r=.*/thinlto-whole-archives/b.libbar.obj[0-9]+,bar,p$}}
+
+target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc"
+
+declare void @bar()
+declare void @foo()
+
+define i32 @main() {
+  call void @foo()
+  call void @bar()
+  ret i32 0
+}
Index: COFF/Driver.cpp
===================================================================
--- COFF/Driver.cpp
+++ COFF/Driver.cpp
@@ -188,8 +188,9 @@
       Archive *archive = file.get();
       make<std::unique_ptr<Archive>>(std::move(file)); // take ownership
 
+      std::uint64_t memberOffset = 0;
       for (MemoryBufferRef m : getArchiveMembers(archive))
-        addArchiveBuffer(m, "<whole-archive>", filename, 0);
+        addArchiveBuffer(m, "<whole-archive>", filename, memberOffset++);
       return;
     }
     symtab->addFile(make<ArchiveFile>(mbref));


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D66239.215198.patch
Type: text/x-patch
Size: 2266 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190814/88554ad7/attachment.bin>