[lld][WebAssembly] Give better error message on bad archive member

[sbc100]

Summary

Include the archive name as well as the member name when an error
is encountered parsing bitcode archives.

[dschuff]

lld/test/wasm/lto/incompatible.ll

12

so this has to be a wildcard {{.*}}.a and can't be something like %t.a? I guess because there's no way to get the basename?

Also: should there be a space between the .a and the (?

[sbc100]

lld/test/wasm/lto/incompatible.ll

12

I'll try just %t.a.

No space between archive name and open paren, no.

[sbc100]

lld/test/wasm/lto/incompatible.ll

12

Actually you can't use %t in check pattern.. would need to pass extra args to FileCheck. I'm inclined to leave this as is.. since it fits with the existing tests and covers what we really care about here.

lld/test/wasm/lto/incompatible.ll

 ; REQUIRES: x86
 ; RUN: llvm-as %s -o %t.bc
 ; RUN: not wasm-ld %t.bc -o %t.wasm 2>&1 | FileCheck %s
 
+; RUN: llvm-ar rc %t.a %t.bc
+; RUN: not wasm-ld --whole-archive %t.a -o %t.wasm 2>&1 | FileCheck %s --check-prefix=CHECK-ARCHIVE
+
 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"
 
 ; CHECK: {{.*}}incompatible.ll.tmp.bc: machine type must be wasm32
+; CHECK-ARCHIVE: wasm-ld: error: {{.*}}.a(incompatible.ll.tmp.bc): machine type must be wasm32

lld/test/wasm/lto/libcall-truncsfhf2.ll

 
 define void @_start() {
   %val1 = load float, float* @g_float
   %v0 = fptrunc float %val1 to half
   store half %v0, half* @g_half
   ret void
 }
 
-; CHECK: wasm-ld: error: {{.*}}truncsfhf2.o: attempt to add bitcode file after LTO.
+; CHECK: wasm-ld: error: {{.*}}truncsfhf2.o): attempt to add bitcode file after LTO.

lld/wasm/InputFiles.cpp

if (objSym.isExecutable())
     return symtab->addDefinedFunction(name, flags, &f, nullptr);
   return symtab->addDefinedData(name, flags, &f, nullptr, 0, 0);
 }
 
 bool BitcodeFile::doneLTO = false;
 
 void BitcodeFile::parse() {
   if (doneLTO) {
-    error(toString(mb.getBufferIdentifier()) +
-          ": attempt to add bitcode file after LTO.");
+    error(toString(this) + ": attempt to add bitcode file after LTO.");
     return;
   }
 
   obj = check(lto::InputFile::create(MemoryBufferRef(
       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");
+    error(toString(this) + ": machine type must be wasm32");
     return;
   }
   std::vector<bool> keptComdats;
   for (StringRef s : obj->getComdatTable())
     keptComdats.push_back(symtab->addComdat(s));
 
   for (const lto::InputFile::Symbol &objSym : obj->symbols())
     symbols.push_back(createBitcodeSymbol(keptComdats, objSym, *this));
 }
 
 } // namespace wasm
 } // namespace lld