[PATCH] D18669: ELF: Correctly handle --whole-archive for thin archives.

[Peter Collingbourne via llvm-commits]

pcc updated this revision to Diff 52288.
pcc marked 2 inline comments as done.
pcc retitled this revision from "ELF: Correctly handle --whole-archive for thin archives.

Depends on D18664

Depends on D18666" to "ELF: Correctly handle --whole-archive for thin archives.".
pcc updated the summary for this revision.
pcc added dependencies: D18666: Object: Correctly read thin archives containing absolute paths., D18664: Object: Add function for moving thin archive object buffer vector out of Archive..
pcc added a comment.

- Address review comments


http://reviews.llvm.org/D18669

Files:
  ELF/Driver.cpp
  ELF/Driver.h
  test/ELF/archive.s
  test/ELF/whole-archive.s

Index: test/ELF/whole-archive.s
===================================================================
--- test/ELF/whole-archive.s
+++ test/ELF/whole-archive.s
@@ -30,5 +30,11 @@
 // RUN: ld.lld -o %t3 %t.o --whole-archive %t.a --no-whole-archive
 // RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=ADDED %s
 
+// --whole-archive should also work with thin archives
+// RUN: rm -f %tthin.a
+// RUN: llvm-ar rcsT %tthin.a %ta.o
+// RUN: ld.lld -o %t3 %t.o --whole-archive %tthin.a --no-whole-archive
+// RUN: llvm-readobj --symbols %t3 | FileCheck --check-prefix=ADDED %s
+
 .globl _start;
 _start:
Index: test/ELF/archive.s
===================================================================
--- test/ELF/archive.s
+++ test/ELF/archive.s
@@ -6,6 +6,9 @@
 # RUN: llvm-ar rcs %tar %t2 %t3 %t4
 # RUN: ld.lld %t %tar %t5 -o %tout
 # RUN: llvm-nm %tout | FileCheck %s
+# RUN: llvm-ar rcsT %tarthin %t2 %t3 %t4
+# RUN: ld.lld %t %tarthin %t5 -o %tout
+# RUN: llvm-nm %tout | FileCheck %s
 # REQUIRES: x86
 
 # Nothing here. Just needed for the linker to create a undefined _start symbol.
Index: ELF/Driver.h
===================================================================
--- ELF/Driver.h
+++ ELF/Driver.h
@@ -28,6 +28,7 @@
   void addLibrary(StringRef Name);
 
 private:
+  std::vector<MemoryBufferRef> getArchiveMembers(MemoryBufferRef MB);
   void readConfigs(llvm::opt::InputArgList &Args);
   void createFiles(llvm::opt::InputArgList &Args);
   template <class ELFT> void link(llvm::opt::InputArgList &Args);
Index: ELF/Driver.cpp
===================================================================
--- ELF/Driver.cpp
+++ ELF/Driver.cpp
@@ -71,7 +71,8 @@
 
 // Returns slices of MB by parsing MB as an archive file.
 // Each slice consists of a member file in the archive.
-static std::vector<MemoryBufferRef> getArchiveMembers(MemoryBufferRef MB) {
+std::vector<MemoryBufferRef>
+LinkerDriver::getArchiveMembers(MemoryBufferRef MB) {
   std::unique_ptr<Archive> File =
       check(Archive::create(MB), "failed to parse archive");
 
@@ -85,6 +86,11 @@
                   File->getFileName());
     V.push_back(Mb);
   }
+
+  // Take ownership of memory buffers created for members of thin archives.
+  for (std::unique_ptr<MemoryBuffer> &MB : File->takeThinBuffers())
+    OwningMBs.push_back(std::move(MB));
+
   return V;
 }
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D18669.52288.patch
Type: text/x-patch
Size: 2343 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160331/8686f677/attachment.bin>