commit dd853e5406bafa2f112991b0532fa045e68d08a4
author Reid Kleckner <rnk@google.com> Thu Jul 27 23:13:18 2017 +0000
committer Reid Kleckner <rnk@google.com> Thu Jul 27 23:13:18 2017 +0000
tree a03ac465550ef12fdcb3cd5a119b291ffff3c46b
parent ef443296a4057193d743ea3981c24aa8027f2de5

[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

llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp

diff --git a/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp b/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp
index 605fff9..892017e 100644
--- a/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp
+++ b/llvm/tools/llvm-pdbutil/DumpOutputStyle.cpp
@@ -167,7 +167,7 @@
 Error DumpOutputStyle::dumpFileSummary() {
   printHeader(P, "Summary");
 
-  ExitOnError Err("Invalid PDB Format");
+  ExitOnError Err("Invalid PDB Format: ");
 
   AutoIndent Indent(P);
   P.formatLine("Block Size: {0}", File.getBlockSize());
@@ -222,7 +222,7 @@
 
 static Expected<ModuleDebugStreamRef> getModuleDebugStream(PDBFile &File,
                                                            uint32_t Index) {
-  ExitOnError Err("Unexpected error");
+  ExitOnError Err("Unexpected error: ");
 
   auto &Dbi = Err(File.getPDBDbiStream());
   const auto &Modules = Dbi.modules();
@@ -258,7 +258,7 @@
 namespace {
 class StringsAndChecksumsPrinter {
   const DebugStringTableSubsectionRef &extractStringTable(PDBFile &File) {
-    ExitOnError Err("Unexpected error processing modules");
+    ExitOnError Err("Unexpected error processing modules: ");
     return Err(File.getStringTable()).getStringTable();
   }
 
@@ -352,7 +352,7 @@
     return;
   }
 
-  ExitOnError Err("Unexpected error processing modules");
+  ExitOnError Err("Unexpected error processing modules: ");
 
   auto &Stream = Err(File.getPDBDbiStream());
 
@@ -409,7 +409,7 @@
     return Error::success();
   }
 
-  ExitOnError Err("Unexpected error processing modules");
+  ExitOnError Err("Unexpected error processing modules: ");
 
   auto &Stream = Err(File.getPDBDbiStream());
 
@@ -438,7 +438,7 @@
 Error DumpOutputStyle::dumpModuleFiles() {
   printHeader(P, "Files");
 
-  ExitOnError Err("Unexpected error processing modules");
+  ExitOnError Err("Unexpected error processing modules: ");
 
   iterateModules(
       File, P, 11,
@@ -738,7 +738,7 @@
     return Error::success();
   }
 
-  ExitOnError Err("Unexpected error processing types");
+  ExitOnError Err("Unexpected error processing types: ");
 
   auto &Stream = Err((StreamIdx == StreamTPI) ? File.getPDBTpiStream()
                                               : File.getPDBIpiStream());
@@ -811,7 +811,7 @@
     return Error::success();
   }
 
-  ExitOnError Err("Unexpected error processing symbols");
+  ExitOnError Err("Unexpected error processing symbols: ");
 
   auto &Stream = Err(File.getPDBDbiStream());
 
@@ -864,7 +864,7 @@
     P.formatLine("Globals stream not present");
     return Error::success();
   }
-  ExitOnError Err("Error dumping globals stream");
+  ExitOnError Err("Error dumping globals stream: ");
   auto &Globals = Err(File.getPDBGlobalsStream());
 
   const GSIHashTable &Table = Globals.getGlobalsTable();
@@ -879,7 +879,7 @@
     P.formatLine("Publics stream not present");
     return Error::success();
   }
-  ExitOnError Err("Error dumping publics stream");
+  ExitOnError Err("Error dumping publics stream: ");
   auto &Publics = Err(File.getPDBPublicsStream());
 
   const GSIHashTable &PublicsTable = Publics.getPublicsTable();
@@ -1051,7 +1051,7 @@
 
 Error DumpOutputStyle::dumpSectionContribs() {
   printHeader(P, "Section Contributions");
-  ExitOnError Err("Error dumping publics stream");
+  ExitOnError Err("Error dumping publics stream: ");
 
   AutoIndent Indent(P);
   if (!File.hasPDBDbiStream()) {
@@ -1097,7 +1097,7 @@
 
 Error DumpOutputStyle::dumpSectionMap() {
   printHeader(P, "Section Map");
-  ExitOnError Err("Error dumping section map");
+  ExitOnError Err("Error dumping section map: ");
 
   AutoIndent Indent(P);
   if (!File.hasPDBDbiStream()) {