OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

COFF: Use ErrorOr::operator* instead of ErrorOr::get. 

This patch is to make COFF coding style consistent with ELF. NFC.

llvm-svn: 245282
This commit is contained in:
Rui Ueyama 2015-08-18 09:18:15 +00:00
parent 570752c7ac
commit 04ec69aa9e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/COFF/DriverUtils.cpp
View File

@ -53,7 +53,7 @@ public:
void run() { void run() {
ErrorOr<std::string> ExeOrErr = llvm::sys::findProgramByName(Prog); ErrorOr<std::string> ExeOrErr = llvm::sys::findProgramByName(Prog);
error(ExeOrErr, Twine("unable to find ") + Prog + " in PATH: "); error(ExeOrErr, Twine("unable to find ") + Prog + " in PATH: ");
const char *Exe = Saver.save(ExeOrErr.get()); const char *Exe = Saver.save(*ExeOrErr);
Args.insert(Args.begin(), Exe); Args.insert(Args.begin(), Exe);
Args.push_back(nullptr); Args.push_back(nullptr);
if (llvm::sys::ExecuteAndWait(Args[0], Args.data()) != 0) { if (llvm::sys::ExecuteAndWait(Args[0], Args.data()) != 0) {

8
lld/COFF/InputFiles.cpp
View File

@ -54,7 +54,7 @@ void ArchiveFile::parse() {
// Parse a MemoryBufferRef as an archive file. // Parse a MemoryBufferRef as an archive file.
auto ArchiveOrErr = Archive::create(MB); auto ArchiveOrErr = Archive::create(MB);
error(ArchiveOrErr, "Failed to parse static library"); error(ArchiveOrErr, "Failed to parse static library");
File = std::move(ArchiveOrErr.get()); File = std::move(*ArchiveOrErr);
// Allocate a buffer for Lazy objects. // Allocate a buffer for Lazy objects.
size_t NumSyms = File->getNumberOfSymbols(); size_t NumSyms = File->getNumberOfSymbols();
@ -79,7 +79,7 @@ MemoryBufferRef ArchiveFile::getMember(const Archive::Symbol *Sym) {
auto ItOrErr = Sym->getMember(); auto ItOrErr = Sym->getMember();
error(ItOrErr, error(ItOrErr,
Twine("Could not get the member for symbol ") + Sym->getName()); Twine("Could not get the member for symbol ") + Sym->getName());
Archive::child_iterator It = ItOrErr.get(); Archive::child_iterator It = *ItOrErr;
// Return an empty buffer if we have already returned the same buffer. // Return an empty buffer if we have already returned the same buffer.
if (Seen[It->getChildOffset()].test_and_set()) if (Seen[It->getChildOffset()].test_and_set())
@ -94,7 +94,7 @@ void ObjectFile::parse() {
// Parse a memory buffer as a COFF file. // Parse a memory buffer as a COFF file.
auto BinOrErr = createBinary(MB); auto BinOrErr = createBinary(MB);
error(BinOrErr, "Failed to parse object file"); error(BinOrErr, "Failed to parse object file");
std::unique_ptr<Binary> Bin = std::move(BinOrErr.get()); std::unique_ptr<Binary> Bin = std::move(*BinOrErr);
if (auto *Obj = dyn_cast<COFFObjectFile>(Bin.get())) { if (auto *Obj = dyn_cast<COFFObjectFile>(Bin.get())) {
Bin.release(); Bin.release();
@ -156,7 +156,7 @@ void ObjectFile::initializeSymbols() {
auto SymOrErr = COFFObj->getSymbol(I); auto SymOrErr = COFFObj->getSymbol(I);
error(SymOrErr, Twine("broken object file: ") + getName()); error(SymOrErr, Twine("broken object file: ") + getName());
COFFSymbolRef Sym = SymOrErr.get(); COFFSymbolRef Sym = *SymOrErr;
const void *AuxP = nullptr; const void *AuxP = nullptr;
if (Sym.getNumberOfAuxSymbols()) if (Sym.getNumberOfAuxSymbols())