Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-12-01 01:31:26 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[LLD] [COFF] Wrap file location pair<StringRef,int> in Optional<>. NFC.

Browse Source 
This makes use of it slightly clearer, and makes it match the
same construct in the lld ELF linker.

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

llvm-svn: 374869
This commit is contained in:
Martin Storsjo 2019-10-15 09:18:18 +00:00
parent cc2f68ea2d
commit 9318c94ebb
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lld/COFF/PDB.cpp
View File

@ -1791,8 +1791,8 @@ static bool findLineTable(const SectionChunk *c, uint32_t addr,
// Use CodeView line tables to resolve a file and line number for the given
// offset into the given chunk and return them, or {"", 0} if a line table was
// not found.
std::pair<StringRef, uint32_t> getFileLineCodeView(const SectionChunk *c,
uint32_t addr) {
Optional<std::pair<StringRef, uint32_t>>
getFileLineCodeView(const SectionChunk *c, uint32_t addr) {
ExitOnError exitOnErr;
DebugStringTableSubsectionRef cVStrTab;
@ -1801,7 +1801,7 @@ std::pair<StringRef, uint32_t> getFileLineCodeView(const SectionChunk *c,
uint32_t offsetInLinetable;
if (!findLineTable(c, addr, cVStrTab, checksums, lines, offsetInLinetable))
return {"", 0};
return None;
Optional<uint32_t> nameIndex;
Optional<uint32_t> lineNumber;
@ -1815,16 +1815,16 @@ std::pair<StringRef, uint32_t> getFileLineCodeView(const SectionChunk *c,
}
StringRef filename =
exitOnErr(getFileName(cVStrTab, checksums, *nameIndex));
return {filename, *lineNumber};
return std::make_pair(filename, *lineNumber);
}
nameIndex = entry.NameIndex;
lineNumber = li.getStartLine();
}
}
if (!nameIndex)
return {"", 0};
return None;
StringRef filename = exitOnErr(getFileName(cVStrTab, checksums, *nameIndex));
return {filename, *lineNumber};
return std::make_pair(filename, *lineNumber);
}
} // namespace coff

9
lld/COFF/PDB.h
View File

@ -10,6 +10,7 @@
#define LLD_COFF_PDB_H
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/StringRef.h"
namespace llvm {
@ -29,9 +30,9 @@ void createPDB(SymbolTable *symtab,
llvm::ArrayRef<uint8_t> sectionTable,
llvm::codeview::DebugInfo *buildId);
std::pair<llvm::StringRef, uint32_t> getFileLineCodeView(const SectionChunk *c,
uint32_t addr);
}
}
llvm::Optional<std::pair<llvm::StringRef, uint32_t>>
getFileLineCodeView(const SectionChunk *c, uint32_t addr);
} // namespace coff
} // namespace lld
#endif

27
lld/COFF/SymbolTable.cpp
View File

@ -108,26 +108,27 @@ static std::vector<std::string> getSymbolLocations(BitcodeFile *file) {
return {res};
}
static std::pair<StringRef, uint32_t> getFileLineDwarf(const SectionChunk *c,
uint32_t addr) {
static Optional<std::pair<StringRef, uint32_t>>
getFileLineDwarf(const SectionChunk *c, uint32_t addr) {
if (!config->symbolizer)
config->symbolizer = make<symbolize::LLVMSymbolizer>();
Expected<DILineInfo> expectedLineInfo = config->symbolizer->symbolizeCode(
*c->file->getCOFFObj(), {addr, c->getSectionNumber() - 1});
if (!expectedLineInfo)
return {"", 0};
return None;
const DILineInfo &lineInfo = *expectedLineInfo;
if (lineInfo.FileName == DILineInfo::BadString)
return {"", 0};
return {saver.save(lineInfo.FileName), lineInfo.Line};
return None;
return std::make_pair(saver.save(lineInfo.FileName), lineInfo.Line);
}
static std::pair<StringRef, uint32_t> getFileLine(const SectionChunk *c,
uint32_t addr) {
static Optional<std::pair<StringRef, uint32_t>>
getFileLine(const SectionChunk *c, uint32_t addr) {
// MinGW can optionally use codeview, even if the default is dwarf.
std::pair<StringRef, uint32_t> fileLine = getFileLineCodeView(c, addr);
Optional<std::pair<StringRef, uint32_t>> fileLine =
getFileLineCodeView(c, addr);
// If codeview didn't yield any result, check dwarf in MinGW mode.
if (fileLine.first.empty() && config->mingw)
if (!fileLine && config->mingw)
fileLine = getFileLineDwarf(c, addr);
return fileLine;
}
@ -150,11 +151,13 @@ std::vector<std::string> getSymbolLocations(ObjFile *file, uint32_t symIndex) {
for (const coff_relocation &r : sc->getRelocs()) {
if (r.SymbolTableIndex != symIndex)
continue;
std::pair<StringRef, uint32_t> fileLine =
Optional<std::pair<StringRef, uint32_t>> fileLine =
getFileLine(sc, r.VirtualAddress);
Symbol *sym = getSymbol(sc, r.VirtualAddress);
if (!fileLine.first.empty() || sym)
locations.push_back({sym, fileLine});
if (fileLine)
locations.push_back({sym, *fileLine});
else if (sym)
locations.push_back({sym});
}
}