Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-04-01 12:43:47 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

[WebAssembly] Ensure ArchiveName is set even in the presence of --whole-archive.

Browse Source 
Differential Revision: https://reviews.llvm.org/D60431

llvm-svn: 357966
This commit is contained in:
Sam Clegg 2019-04-09 05:41:52 +00:00
parent 3f2096833a
commit 0cfaa2470f
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/test/wasm/archive.ll
View File

@ -47,6 +47,8 @@ entry:
; 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)

2
lld/wasm/Driver.cpp
View File

@ -226,7 +226,7 @@ void LinkerDriver::addFile(StringRef Path) {
// Handle -whole-archive.
if (InWholeArchive) {
for (MemoryBufferRef &M : getArchiveMembers(MBRef))
Files.push_back(createObjectFile(M));
Files.push_back(createObjectFile(M, Path));
return;
}

10
lld/wasm/InputFiles.cpp
View File

@ -42,18 +42,19 @@ Optional<MemoryBufferRef> lld::wasm::readFile(StringRef Path) {
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());
}
@ -435,8 +436,7 @@ void ArchiveFile::addMember(const Archive::Symbol *Sym) {
"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);
}

12
lld/wasm/InputFiles.h
View File

@ -82,7 +82,10 @@ private:
// .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;
@ -144,7 +147,10 @@ public:
// .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;
@ -153,7 +159,7 @@ public:
// 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);

2
lld/wasm/SymbolTable.cpp
View File

@ -58,7 +58,7 @@ void SymbolTable::addCombinedLTOObject() {
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);
}

2
lld/wasm/SymbolTable.h
View File

@ -39,7 +39,7 @@ public:
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;