[lld] r302235 - Remember archive name when creating LazyObjectFile.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Fri May  5 08:55:51 2017
New Revision: 302235

URL: http://llvm.org/viewvc/llvm-project?rev=302235&view=rev
Log:
Remember archive name when creating LazyObjectFile.

It is needed for creating an unique identifier for ThinLTO.

This fixes pr32931.

Added:
    lld/trunk/test/ELF/lto/Inputs/duplicated-name.ll
    lld/trunk/test/ELF/lto/duplicated-name.ll
Modified:
    lld/trunk/ELF/Driver.cpp
    lld/trunk/ELF/InputFiles.cpp
    lld/trunk/ELF/InputFiles.h

Modified: lld/trunk/ELF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Driver.cpp?rev=302235&r1=302234&r2=302235&view=diff
==============================================================================
--- lld/trunk/ELF/Driver.cpp (original)
+++ lld/trunk/ELF/Driver.cpp Fri May  5 08:55:51 2017
@@ -187,7 +187,7 @@ void LinkerDriver::addFile(StringRef Pat
     // we'll handle it as if it had a symbol table.
     if (!File->hasSymbolTable()) {
       for (MemoryBufferRef MB : getArchiveMembers(MBRef))
-        Files.push_back(make<LazyObjectFile>(MB));
+        Files.push_back(make<LazyObjectFile>(MB, MBRef.getBufferIdentifier()));
       return;
     }
 
@@ -215,7 +215,7 @@ void LinkerDriver::addFile(StringRef Pat
     return;
   default:
     if (InLib)
-      Files.push_back(make<LazyObjectFile>(MBRef));
+      Files.push_back(make<LazyObjectFile>(MBRef, ""));
     else
       Files.push_back(createObjectFile(MBRef));
   }

Modified: lld/trunk/ELF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=302235&r1=302234&r2=302235&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.cpp (original)
+++ lld/trunk/ELF/InputFiles.cpp Fri May  5 08:55:51 2017
@@ -981,7 +981,7 @@ InputFile *LazyObjectFile::fetch() {
   MemoryBufferRef MBRef = getBuffer();
   if (MBRef.getBuffer().empty())
     return nullptr;
-  return createObjectFile(MBRef);
+  return createObjectFile(MBRef, ArchiveName);
 }
 
 template <class ELFT> void LazyObjectFile::parse() {

Modified: lld/trunk/ELF/InputFiles.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.h?rev=302235&r1=302234&r2=302235&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.h (original)
+++ lld/trunk/ELF/InputFiles.h Fri May  5 08:55:51 2017
@@ -219,7 +219,10 @@ private:
 // archive file semantics.
 class LazyObjectFile : public InputFile {
 public:
-  explicit LazyObjectFile(MemoryBufferRef M) : InputFile(LazyObjectKind, M) {}
+  explicit LazyObjectFile(MemoryBufferRef M, StringRef ArchiveName)
+      : InputFile(LazyObjectKind, M) {
+    this->ArchiveName = ArchiveName;
+  }
 
   static bool classof(const InputFile *F) {
     return F->kind() == LazyObjectKind;

Added: lld/trunk/test/ELF/lto/Inputs/duplicated-name.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/Inputs/duplicated-name.ll?rev=302235&view=auto
==============================================================================
--- lld/trunk/test/ELF/lto/Inputs/duplicated-name.ll (added)
+++ lld/trunk/test/ELF/lto/Inputs/duplicated-name.ll Fri May  5 08:55:51 2017
@@ -0,0 +1,6 @@
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+define void @f2() {
+  ret void
+}

Added: lld/trunk/test/ELF/lto/duplicated-name.ll
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/lto/duplicated-name.ll?rev=302235&view=auto
==============================================================================
--- lld/trunk/test/ELF/lto/duplicated-name.ll (added)
+++ lld/trunk/test/ELF/lto/duplicated-name.ll Fri May  5 08:55:51 2017
@@ -0,0 +1,15 @@
+; REQUIRES: x86
+; Cretae two archive with the same member name
+; RUN: rm -f %t1.a %t2.a
+; RUN: opt -module-summary %s -o %t.o
+; RUN: llvm-ar rcS %t1.a %t.o
+; RUN: opt -module-summary %p/Inputs/duplicated-name.ll -o %t.o
+; RUN: llvm-ar rcS %t2.a %t.o
+; RUN: ld.lld -m elf_x86_64 -shared -o %t.so -uf1 -uf2 %t1.a %t2.a
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+define void @f1() {
+  ret void
+}