Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-14 03:29:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[WebAssembly] Fix archive member display in error messages

Browse Source 
Add a test for this by causing a symbol collision
between archive members.

Differential Revision: https://reviews.llvm.org/D49343

llvm-svn: 337426
This commit is contained in:
Sam Clegg 2018-07-18 21:46:09 +00:00
parent 47068a42d2
commit 2df314d17f
5 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lld/test/wasm/Inputs/archive2.ll
View File

@ -7,3 +7,8 @@ entry:
%call = tail call i32 @foo() #2
ret i32 %call
}
define void @archive2_symbol() local_unnamed_addr #0 {
entry:
ret void
}

11
lld/test/wasm/Inputs/archive3.ll Normal file
View File

@ -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
}

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

@ -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 @@ entry:
; 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 @@ entry:
; 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)

8
lld/wasm/InputFiles.cpp
View File

@ -372,7 +372,7 @@ void ArchiveFile::addMember(const Archive::Symbol *Sym) {
return;
}
Obj->ParentName = ParentName;
Obj->ArchiveName = getName();
Symtab->addFile(Obj);
}
@ -407,7 +407,7 @@ static Symbol *createBitcodeSymbol(const lto::InputFile::Symbol &ObjSym,
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 @@ std::string lld::toString(const wasm::InputFile *File) {
if (!File)
return "<internal>";
if (File->ParentName.empty())
if (File->ArchiveName.empty())
return File->getName();
return (File->ParentName + "(" + File->getName() + ")").str();
return (File->ArchiveName + "(" + File->getName() + ")").str();
}

2
lld/wasm/InputFiles.h
View File

@ -63,7 +63,7 @@ public:
Kind kind() const { return FileKind; }
// An archive file name if this file is created from an archive.
StringRef ParentName;
StringRef ArchiveName;
ArrayRef<Symbol *> getSymbols() const { return Symbols; }