; 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
+; And that this also works with --whole-archive
+; RUN: not wasm-ld -u archive2_symbol -u archive3_symbol --whole-archive %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)
// Handle -whole-archive.
if (InWholeArchive) {
for (MemoryBufferRef &M : getArchiveMembers(MBRef))
- Files.push_back(createObjectFile(M));
+ Files.push_back(createObjectFile(M, Path));
return;
}
return MBRef;
}
-InputFile *lld::wasm::createObjectFile(MemoryBufferRef MB) {
+InputFile *lld::wasm::createObjectFile(MemoryBufferRef MB,
+ StringRef ArchiveName) {
file_magic Magic = identify_magic(MB.getBuffer());
if (Magic == file_magic::wasm_object) {
std::unique_ptr<Binary> Bin = check(createBinary(MB));
auto *Obj = cast<WasmObjectFile>(Bin.get());
if (Obj->isSharedObject())
return make<SharedFile>(MB);
- return make<ObjFile>(MB);
+ return make<ObjFile>(MB, ArchiveName);
}
if (Magic == file_magic::bitcode)
- return make<BitcodeFile>(MB);
+ return make<BitcodeFile>(MB, ArchiveName);
fatal("unknown file type: " + MB.getBufferIdentifier());
}
"could not get the buffer for the member defining symbol " +
Sym->getName());
- InputFile *Obj = createObjectFile(MB);
- Obj->ArchiveName = getName();
+ InputFile *Obj = createObjectFile(MB, getName());
Symtab->addFile(Obj);
}
// .o file (wasm object file)
class ObjFile : public InputFile {
public:
- explicit ObjFile(MemoryBufferRef M) : InputFile(ObjectKind, M) {}
+ explicit ObjFile(MemoryBufferRef M, StringRef ArchiveName)
+ : InputFile(ObjectKind, M) {
+ this->ArchiveName = ArchiveName;
+ }
static bool classof(const InputFile *F) { return F->kind() == ObjectKind; }
void parse() override;
// .bc file
class BitcodeFile : public InputFile {
public:
- explicit BitcodeFile(MemoryBufferRef M) : InputFile(BitcodeKind, M) {}
+ explicit BitcodeFile(MemoryBufferRef M, StringRef ArchiveName)
+ : InputFile(BitcodeKind, M) {
+ this->ArchiveName = ArchiveName;
+ }
static bool classof(const InputFile *F) { return F->kind() == BitcodeKind; }
void parse() override;
// Will report a fatal() error if the input buffer is not a valid bitcode
// or wasm object file.
-InputFile *createObjectFile(MemoryBufferRef MB);
+InputFile *createObjectFile(MemoryBufferRef MB, StringRef ArchiveName = "");
// Opens a given file.
llvm::Optional<MemoryBufferRef> readFile(StringRef Path);
LTO->add(*F);
for (StringRef Filename : LTO->compile()) {
- auto *Obj = make<ObjFile>(MemoryBufferRef(Filename, "lto.tmp"));
+ auto *Obj = make<ObjFile>(MemoryBufferRef(Filename, "lto.tmp"), "");
Obj->parse();
ObjectFiles.push_back(Obj);
}
void addCombinedLTOObject();
std::vector<ObjFile *> ObjectFiles;
- std::vector<InputFile *> SharedFiles;
+ std::vector<SharedFile *> SharedFiles;
std::vector<BitcodeFile *> BitcodeFiles;
std::vector<InputFunction *> SyntheticFunctions;
std::vector<InputGlobal *> SyntheticGlobals;