Index: test/wasm/Inputs/archive2.ll =================================================================== --- test/wasm/Inputs/archive2.ll +++ test/wasm/Inputs/archive2.ll @@ -7,3 +7,8 @@ %call = tail call i32 @foo() #2 ret i32 %call } + +define void @archive2_symbol() local_unnamed_addr #0 { +entry: + ret void +} Index: test/wasm/Inputs/archive3.ll =================================================================== --- test/wasm/Inputs/archive3.ll +++ test/wasm/Inputs/archive3.ll @@ -0,0 +1,11 @@ +target triple = "wasm32-unknown-unknown" + +define i32 @bar() local_unnamed_addr #0 { +entry: + ret i32 1 +} + +define void @archive3_symbol() local_unnamed_addr #0 { +entry: + ret void +} Index: test/wasm/archive.ll =================================================================== --- test/wasm/archive.ll +++ test/wasm/archive.ll @@ -1,8 +1,9 @@ ; RUN: llc -filetype=obj %s -o %t.o ; RUN: llc -filetype=obj %S/Inputs/archive1.ll -o %t.a1.o ; RUN: llc -filetype=obj %S/Inputs/archive2.ll -o %t.a2.o -; RUN: llc -filetype=obj %S/Inputs/hello.ll -o %t.a3.o -; RUN: llvm-ar rcs %t.a %t.a1.o %t.a2.o %t.a3.o +; RUN: llc -filetype=obj %S/Inputs/archive3.ll -o %t.a3.o +; RUN: llc -filetype=obj %S/Inputs/hello.ll -o %t.hello.o +; RUN: llvm-ar rcs %t.a %t.a1.o %t.a2.o %t.a3.o %t.hello.o ; RUN: rm -f %t.imports ; RUN: not wasm-ld %t.a %t.o -o %t.wasm 2>&1 | FileCheck -check-prefix=CHECK-UNDEFINED %s @@ -31,9 +32,10 @@ ; TODO(ncw): Update LLD so that the symbol table is written out for ; non-relocatable output (with an option to strip it) -; CHECK: 00000003 T _start +; CHECK: 00000004 T _start +; CHECK-NEXT: 00000002 T archive2_symbol ; CHECK-NEXT: 00000001 T bar -; CHECK-NEXT: 00000002 T foo +; CHECK-NEXT: 00000003 T foo ; CHECK-NEXT: U missing_func ; Verify that symbols from unused objects don't appear in the symbol table @@ -41,3 +43,9 @@ ; Specifying the same archive twice is allowed. ; RUN: wasm-ld %t.a %t.a %t.o -o %t.wasm + +; Verfiy errors include library name +; RUN: not wasm-ld -u archive2_symbol -u archive3_symbol %t.a %t.o -o %t.wasm 2>&1 | FileCheck -check-prefix=CHECK-DUP %s +; CHECK-DUP: error: duplicate symbol: bar +; CHECK-DUP: >>> defined in {{.*}}.a({{.*}}.a2.o) +; CHECK-DUP: >>> defined in {{.*}}.a({{.*}}.a3.o) Index: wasm/InputFiles.h =================================================================== --- wasm/InputFiles.h +++ wasm/InputFiles.h @@ -63,7 +63,7 @@ Kind kind() const { return FileKind; } // An archive file name if this file is created from an archive. - StringRef ParentName; + StringRef ArchiveName; ArrayRef getSymbols() const { return Symbols; } Index: wasm/InputFiles.cpp =================================================================== --- wasm/InputFiles.cpp +++ wasm/InputFiles.cpp @@ -372,7 +372,7 @@ return; } - Obj->ParentName = ParentName; + Obj->ArchiveName = getName(); Symtab->addFile(Obj); } @@ -407,7 +407,7 @@ void BitcodeFile::parse() { Obj = check(lto::InputFile::create(MemoryBufferRef( - MB.getBuffer(), Saver.save(ParentName + MB.getBufferIdentifier())))); + MB.getBuffer(), Saver.save(ArchiveName + MB.getBufferIdentifier())))); Triple T(Obj->getTargetTriple()); if (T.getArch() != Triple::wasm32) { error(toString(MB.getBufferIdentifier()) + ": machine type must be wasm32"); @@ -423,8 +423,8 @@ if (!File) return ""; - if (File->ParentName.empty()) + if (File->ArchiveName.empty()) return File->getName(); - return (File->ParentName + "(" + File->getName() + ")").str(); + return (File->ArchiveName + "(" + File->getName() + ")").str(); }