maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-pdbutil] Clean up ExitOnError usage to add ": " to our errors 

The banner parameter is supposed to end in a separator, like ": ".
Otherwise, we get ugly errors like:

Error while reading publics streamNative error: blah blah

llvm-svn: 309332
This commit is contained in:
Reid Kleckner 2017-07-27 23:13:18 +00:00
parent ef443296a4
commit dd853e5406
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp
View File

@ -167,7 +167,7 @@ static void printHeader(LinePrinter &P, const Twine &S) {
Error DumpOutputStyle::dumpFileSummary() { Error DumpOutputStyle::dumpFileSummary() {
printHeader(P, "Summary"); printHeader(P, "Summary");
ExitOnError Err("Invalid PDB Format"); ExitOnError Err("Invalid PDB Format: ");
AutoIndent Indent(P); AutoIndent Indent(P);
P.formatLine("Block Size: {0}", File.getBlockSize()); P.formatLine("Block Size: {0}", File.getBlockSize());
@ -222,7 +222,7 @@ Error DumpOutputStyle::dumpStreamSummary() {
static Expected<ModuleDebugStreamRef> getModuleDebugStream(PDBFile &File, static Expected<ModuleDebugStreamRef> getModuleDebugStream(PDBFile &File,
uint32_t Index) { uint32_t Index) {
ExitOnError Err("Unexpected error"); ExitOnError Err("Unexpected error: ");
auto &Dbi = Err(File.getPDBDbiStream()); auto &Dbi = Err(File.getPDBDbiStream());
const auto &Modules = Dbi.modules(); const auto &Modules = Dbi.modules();
@ -258,7 +258,7 @@ static std::string formatChecksumKind(FileChecksumKind Kind) {
namespace { namespace {
class StringsAndChecksumsPrinter { class StringsAndChecksumsPrinter {
const DebugStringTableSubsectionRef &extractStringTable(PDBFile &File) { const DebugStringTableSubsectionRef &extractStringTable(PDBFile &File) {
ExitOnError Err("Unexpected error processing modules"); ExitOnError Err("Unexpected error processing modules: ");
return Err(File.getStringTable()).getStringTable(); return Err(File.getStringTable()).getStringTable();
} }
@ -352,7 +352,7 @@ static void iterateModules(PDBFile &File, LinePrinter &P, uint32_t IndentLevel,
return; return;
} }
ExitOnError Err("Unexpected error processing modules"); ExitOnError Err("Unexpected error processing modules: ");
auto &Stream = Err(File.getPDBDbiStream()); auto &Stream = Err(File.getPDBDbiStream());
@ -409,7 +409,7 @@ Error DumpOutputStyle::dumpModules() {
return Error::success(); return Error::success();
} }
ExitOnError Err("Unexpected error processing modules"); ExitOnError Err("Unexpected error processing modules: ");
auto &Stream = Err(File.getPDBDbiStream()); auto &Stream = Err(File.getPDBDbiStream());
@ -438,7 +438,7 @@ Error DumpOutputStyle::dumpModules() {
Error DumpOutputStyle::dumpModuleFiles() { Error DumpOutputStyle::dumpModuleFiles() {
printHeader(P, "Files"); printHeader(P, "Files");
ExitOnError Err("Unexpected error processing modules"); ExitOnError Err("Unexpected error processing modules: ");
iterateModules( iterateModules(
File, P, 11, File, P, 11,
@ -738,7 +738,7 @@ Error DumpOutputStyle::dumpTpiStream(uint32_t StreamIdx) {
return Error::success(); return Error::success();
} }
ExitOnError Err("Unexpected error processing types"); ExitOnError Err("Unexpected error processing types: ");
auto &Stream = Err((StreamIdx == StreamTPI) ? File.getPDBTpiStream() auto &Stream = Err((StreamIdx == StreamTPI) ? File.getPDBTpiStream()
: File.getPDBIpiStream()); : File.getPDBIpiStream());
@ -811,7 +811,7 @@ Error DumpOutputStyle::dumpModuleSyms() {
return Error::success(); return Error::success();
} }
ExitOnError Err("Unexpected error processing symbols"); ExitOnError Err("Unexpected error processing symbols: ");
auto &Stream = Err(File.getPDBDbiStream()); auto &Stream = Err(File.getPDBDbiStream());
@ -864,7 +864,7 @@ Error DumpOutputStyle::dumpGlobals() {
P.formatLine("Globals stream not present"); P.formatLine("Globals stream not present");
return Error::success(); return Error::success();
} }
ExitOnError Err("Error dumping globals stream"); ExitOnError Err("Error dumping globals stream: ");
auto &Globals = Err(File.getPDBGlobalsStream()); auto &Globals = Err(File.getPDBGlobalsStream());
const GSIHashTable &Table = Globals.getGlobalsTable(); const GSIHashTable &Table = Globals.getGlobalsTable();
@ -879,7 +879,7 @@ Error DumpOutputStyle::dumpPublics() {
P.formatLine("Publics stream not present"); P.formatLine("Publics stream not present");
return Error::success(); return Error::success();
} }
ExitOnError Err("Error dumping publics stream"); ExitOnError Err("Error dumping publics stream: ");
auto &Publics = Err(File.getPDBPublicsStream()); auto &Publics = Err(File.getPDBPublicsStream());
const GSIHashTable &PublicsTable = Publics.getPublicsTable(); const GSIHashTable &PublicsTable = Publics.getPublicsTable();
@ -1051,7 +1051,7 @@ static std::string formatSegMapDescriptorFlag(uint32_t IndentLevel,
Error DumpOutputStyle::dumpSectionContribs() { Error DumpOutputStyle::dumpSectionContribs() {
printHeader(P, "Section Contributions"); printHeader(P, "Section Contributions");
ExitOnError Err("Error dumping publics stream"); ExitOnError Err("Error dumping publics stream: ");
AutoIndent Indent(P); AutoIndent Indent(P);
if (!File.hasPDBDbiStream()) { if (!File.hasPDBDbiStream()) {
@ -1097,7 +1097,7 @@ Error DumpOutputStyle::dumpSectionContribs() {
Error DumpOutputStyle::dumpSectionMap() { Error DumpOutputStyle::dumpSectionMap() {
printHeader(P, "Section Map"); printHeader(P, "Section Map");
ExitOnError Err("Error dumping section map"); ExitOnError Err("Error dumping section map: ");
AutoIndent Indent(P); AutoIndent Indent(P);
if (!File.hasPDBDbiStream()) { if (!File.hasPDBDbiStream()) {