diff options
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp | 6 | ||||
| -rw-r--r-- | llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp b/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp index bd9cf7d5df2..e4d32abb95c 100644 --- a/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp +++ b/llvm/tools/llvm-cxxdump/llvm-cxxdump.cpp @@ -188,12 +188,10 @@ static void dumpCXXData(const ObjectFile *Obj) { uint8_t BytesInAddress = Obj->getBytesInAddress(); - ErrorOr<std::vector<std::pair<SymbolRef, uint64_t>>> SymAddrOrErr = + std::vector<std::pair<SymbolRef, uint64_t>> SymAddr = object::computeSymbolSizes(*Obj); - if (error(SymAddrOrErr.getError())) - return; - for (auto &P : *SymAddrOrErr) { + for (auto &P : SymAddr) { object::SymbolRef Sym = P.first; uint64_t SymSize = P.second; StringRef SymName; diff --git a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp index addea588472..65033a2e0cc 100644 --- a/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp +++ b/llvm/tools/llvm-rtdyld/llvm-rtdyld.cpp @@ -259,13 +259,11 @@ static int printLineInfoForInput(bool LoadObjects, bool UseDebugObj) { std::unique_ptr<DIContext> Context( new DWARFContextInMemory(*SymbolObj,LoadedObjInfo.get())); - ErrorOr<std::vector<std::pair<SymbolRef, uint64_t>>> SymAddrOrErr = + std::vector<std::pair<SymbolRef, uint64_t>> SymAddr = object::computeSymbolSizes(*SymbolObj); - if (std::error_code EC = SymAddrOrErr.getError()) - return Error(EC.message()); // Use symbol info to iterate functions in the object. - for (const auto &P : *SymAddrOrErr) { + for (const auto &P : SymAddr) { object::SymbolRef Sym = P.first; object::SymbolRef::Type SymType; if (Sym.getType(SymType)) |
