diff options
author | Jonas Devlieghere <jonas@devlieghere.com> | 2018-11-11 01:46:03 +0000 |
---|---|---|
committer | Jonas Devlieghere <jonas@devlieghere.com> | 2018-11-11 01:46:03 +0000 |
commit | 45eb84f34044c2e3c83f420c9bbdcdf028eb80c4 (patch) | |
tree | 393e63edefba1bf8f317f27f522b2ec9db06efe0 /llvm/tools/llvm-nm/llvm-nm.cpp | |
parent | ef33a190bccc782a505ff0b18cadc278ec682926 (diff) | |
download | bcm5719-llvm-45eb84f34044c2e3c83f420c9bbdcdf028eb80c4.tar.gz bcm5719-llvm-45eb84f34044c2e3c83f420c9bbdcdf028eb80c4.zip |
[Support] Make error banner optional in logAllUnhandledErrors
In a lot of places an empty string was passed as the ErrorBanner to
logAllUnhandledErrors. This patch makes that argument optional to
simplify the call sites.
llvm-svn: 346604
Diffstat (limited to 'llvm/tools/llvm-nm/llvm-nm.cpp')
-rw-r--r-- | llvm/tools/llvm-nm/llvm-nm.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp index 21f3a2bade5..a30a71ac6a0 100644 --- a/llvm/tools/llvm-nm/llvm-nm.cpp +++ b/llvm/tools/llvm-nm/llvm-nm.cpp @@ -209,7 +209,7 @@ static bool error(std::error_code EC, Twine Path = Twine()) { // This version of error() prints the archive name and member name, for example: // "libx.a(foo.o)" after the ToolName before the error message. It sets -// HadError but returns allowing the code to move on to other archive members. +// HadError but returns allowing the code to move on to other archive members. static void error(llvm::Error E, StringRef FileName, const Archive::Child &C, StringRef ArchitectureName = StringRef()) { HadError = true; @@ -230,7 +230,7 @@ static void error(llvm::Error E, StringRef FileName, const Archive::Child &C, std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(std::move(E), OS, ""); + logAllUnhandledErrors(std::move(E), OS); OS.flush(); errs() << " " << Buf << "\n"; } @@ -238,7 +238,7 @@ static void error(llvm::Error E, StringRef FileName, const Archive::Child &C, // This version of error() prints the file name and which architecture slice it // is from, for example: "foo.o (for architecture i386)" after the ToolName // before the error message. It sets HadError but returns allowing the code to -// move on to other architecture slices. +// move on to other architecture slices. static void error(llvm::Error E, StringRef FileName, StringRef ArchitectureName = StringRef()) { HadError = true; @@ -249,7 +249,7 @@ static void error(llvm::Error E, StringRef FileName, std::string Buf; raw_string_ostream OS(Buf); - logAllUnhandledErrors(std::move(E), OS, ""); + logAllUnhandledErrors(std::move(E), OS); OS.flush(); errs() << " " << Buf << "\n"; } @@ -1029,8 +1029,7 @@ static char getSymbolNMTypeChar(MachOObjectFile &Obj, basic_symbol_iterator I) { StringRef SectionName; Obj.getSectionName(Ref, SectionName); StringRef SegmentName = Obj.getSectionFinalSegmentName(Ref); - if (Obj.is64Bit() && - Obj.getHeader64().filetype == MachO::MH_KEXT_BUNDLE && + if (Obj.is64Bit() && Obj.getHeader64().filetype == MachO::MH_KEXT_BUNDLE && SegmentName == "__TEXT_EXEC" && SectionName == "__text") return 't'; if (SegmentName == "__TEXT" && SectionName == "__text") @@ -1606,7 +1605,7 @@ dumpSymbolNamesFromObject(SymbolicFile &Obj, bool printName, uint64_t lc_main_offset = UINT64_MAX; for (const auto &Command : MachO->load_commands()) { if (Command.C.cmd == MachO::LC_FUNCTION_STARTS) { - // We found a function starts segment, parse the addresses for + // We found a function starts segment, parse the addresses for // consumption. MachO::linkedit_data_command LLC = MachO->getLinkeditDataLoadCommand(Command); |