maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

lld-link: Include the name of bad input files in several "input file is bad" diagnostics. 

Also change a few getName() calls to getShortName() calls.
https://reviews.llvm.org/D23123
Part of PR28553.

llvm-svn: 277616
This commit is contained in:
Nico Weber 2016-08-03 18:07:28 +00:00
parent 8c04cbf882
commit 204f7dc56e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lld/COFF/InputFiles.cpp
View File

@ -64,7 +64,7 @@ std::string InputFile::getShortName() {
void ArchiveFile::parse() {
// Parse a MemoryBufferRef as an archive file.
File = check(Archive::create(MB), "failed to parse static library");
File = check(Archive::create(MB), getShortName());
// Allocate a buffer for Lazy objects.
size_t NumSyms = File->getNumberOfSymbols();
@ -81,7 +81,7 @@ void ArchiveFile::parse() {
for (auto &Child : File->children(Err))
Seen[Child.getChildOffset()].clear();
if (Err)
fatal(Err, "failed to parse static library");
fatal(Err, getShortName());
}
// Returns a buffer pointing to a member file containing a given symbol.
@ -109,13 +109,13 @@ MemoryBufferRef ArchiveFile::getMember(const Archive::Symbol *Sym) {
void ObjectFile::parse() {
// Parse a memory buffer as a COFF file.
std::unique_ptr<Binary> Bin =
check(createBinary(MB), "failed to parse object file");
check(createBinary(MB), getShortName());
if (auto *Obj = dyn_cast<COFFObjectFile>(Bin.get())) {
Bin.release();
COFFObj.reset(Obj);
} else {
fatal(getName() + " is not a COFF file");
fatal(getShortName() + " is not a COFF file");
}
// Read section and symbol tables.
@ -169,7 +169,7 @@ void ObjectFile::initializeSymbols() {
for (uint32_t I = 0; I < NumSymbols; ++I) {
// Get a COFFSymbolRef object.
COFFSymbolRef Sym =
check(COFFObj->getSymbol(I), "broken object file: " + getName());
check(COFFObj->getSymbol(I), "broken object file: " + getShortName());
const void *AuxP = nullptr;
if (Sym.getNumberOfAuxSymbols())
@ -231,12 +231,12 @@ Defined *ObjectFile::createDefined(COFFSymbolRef Sym, const void *AuxP,
// Reserved sections numbers don't have contents.
if (llvm::COFF::isReservedSectionNumber(SectionNumber))
fatal("broken object file: " + getName());
fatal("broken object file: " + getShortName());
// This symbol references a section which is not present in the section
// header.
if ((uint32_t)SectionNumber >= SparseChunks.size())
fatal("broken object file: " + getName());
fatal("broken object file: " + getShortName());
// Nothing else to do without a section chunk.
auto *SC = cast_or_null<SectionChunk>(SparseChunks[SectionNumber]);