Index: llvm-cxxdump.cpp =================================================================== --- llvm-cxxdump.cpp +++ llvm-cxxdump.cpp @@ -40,18 +40,14 @@ cl::ZeroOrMore); } // namespace opts -static int ReturnValue = EXIT_SUCCESS; - namespace llvm { -static bool error(std::error_code EC) { +static void error(std::error_code EC) { if (!EC) - return false; - - ReturnValue = EXIT_FAILURE; + return; outs() << "\nError reading file: " << EC.message() << ".\n"; outs().flush(); - return true; + exit(1); } } // namespace llvm @@ -59,10 +55,9 @@ static void reportError(StringRef Input, StringRef Message) { if (Input == "-") Input = ""; - errs() << Input << ": " << Message << "\n"; errs().flush(); - ReturnValue = EXIT_FAILURE; + exit(1); } static void reportError(StringRef Input, std::error_code EC) { @@ -84,7 +79,7 @@ return SectionRelocMap[Sec]; } -static bool collectRelocatedSymbols(const ObjectFile *Obj, +static void collectRelocatedSymbols(const ObjectFile *Obj, const SectionRef &Sec, uint64_t SecAddress, uint64_t SymAddress, uint64_t SymSize, StringRef *I, StringRef *E) { @@ -98,8 +93,7 @@ if (RelocSymI == Obj->symbol_end()) continue; ErrorOr RelocSymName = RelocSymI->getName(); - if (error(RelocSymName.getError())) - return true; + error(RelocSymName.getError()); uint64_t Offset = Reloc.getOffset(); if (Offset >= SymOffset && Offset < SymEnd) { *I = *RelocSymName; @@ -107,10 +101,9 @@ } } } - return false; } -static bool collectRelocationOffsets( +static void collectRelocationOffsets( const ObjectFile *Obj, const SectionRef &Sec, uint64_t SecAddress, uint64_t SymAddress, uint64_t SymSize, StringRef SymName, std::map, StringRef> &Collection) { @@ -122,14 +115,12 @@ if (RelocSymI == Obj->symbol_end()) continue; ErrorOr RelocSymName = RelocSymI->getName(); - if (error(RelocSymName.getError())) - return true; + error(RelocSymName.getError()); uint64_t Offset = Reloc.getOffset(); if (Offset >= SymOffset && Offset < SymEnd) Collection[std::make_pair(SymName, Offset - SymOffset)] = *RelocSymName; } } - return false; } static void dumpCXXData(const ObjectFile *Obj) { @@ -191,12 +182,10 @@ object::SymbolRef Sym = P.first; uint64_t SymSize = P.second; ErrorOr SymNameOrErr = Sym.getName(); - if (error(SymNameOrErr.getError())) - return; + error(SymNameOrErr.getError()); StringRef SymName = *SymNameOrErr; object::section_iterator SecI(Obj->section_begin()); - if (error(Sym.getSection(SecI))) - return; + error(Sym.getSection(SecI)); // Skip external symbols. if (SecI == Obj->section_end()) continue; @@ -205,11 +194,9 @@ if (Sec.isBSS() || Sec.isVirtual()) continue; StringRef SecContents; - if (error(Sec.getContents(SecContents))) - return; + error(Sec.getContents(SecContents)); ErrorOr SymAddressOrErr = Sym.getAddress(); - if (error(SymAddressOrErr.getError())) - return; + error(SymAddressOrErr.getError()); uint64_t SymAddress = *SymAddressOrErr; uint64_t SecAddress = Sec.getAddress(); uint64_t SecSize = Sec.getSize(); @@ -239,9 +226,7 @@ COL.Data = ArrayRef( reinterpret_cast(SymContents.data()), 3); StringRef *I = std::begin(COL.Symbols), *E = std::end(COL.Symbols); - if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I, - E)) - return; + collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I, E); COLs[SymName] = COL; } // Class hierarchy descriptors in the MS-ABI start with '??_R3' @@ -250,9 +235,7 @@ CHD.Data = ArrayRef( reinterpret_cast(SymContents.data()), 3); StringRef *I = std::begin(CHD.Symbols), *E = std::end(CHD.Symbols); - if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I, - E)) - return; + collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I, E); CHDs[SymName] = CHD; } // Class hierarchy descriptors in the MS-ABI start with '??_R2' @@ -268,9 +251,7 @@ BCD.Data = ArrayRef( reinterpret_cast(SymContents.data()) + 1, 5); StringRef *I = std::begin(BCD.Symbols), *E = std::end(BCD.Symbols); - if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I, - E)) - return; + collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I, E); BCDs[SymName] = BCD; } // Type descriptors in the MS-ABI start with '??_R0' @@ -283,9 +264,7 @@ TD.AlwaysZero = *reinterpret_cast(DataPtr); TD.MangledName = SymContents.drop_front(BytesInAddress * 2); StringRef *I = std::begin(TD.Symbols), *E = std::end(TD.Symbols); - if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I, - E)) - return; + collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I, E); TDs[SymName] = TD; } // Throw descriptors in the MS-ABI start with '_TI' @@ -316,9 +295,7 @@ CT.VirtualBaseAdjustmentOffset = DataPtr[4]; CT.Size = DataPtr[5]; StringRef *I = std::begin(CT.Symbols), *E = std::end(CT.Symbols); - if (collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I, - E)) - return; + collectRelocatedSymbols(Obj, Sec, SecAddress, SymAddress, SymSize, I, E); CTs[SymName] = CT; } // Construction vtables in the Itanium ABI start with '_ZTT' or '__ZTT'. @@ -569,5 +546,5 @@ std::for_each(opts::InputFilenames.begin(), opts::InputFilenames.end(), dumpInput); - return ReturnValue; + return EXIT_SUCCESS; }