Fix -Wcovered-switch-default warnings from r314821

llvm-svn: 314826

2 files changed, 3 insertions, 5 deletions

diff --git a/llvm/lib/DebugInfo/PDB/PDBExtras.cpp b/llvm/lib/DebugInfo/PDB/PDBExtras.cpp
index 4e73e5f67b2..147e2f7abfe 100644
--- a/llvm/lib/DebugInfo/PDB/PDBExtras.cpp
+++ b/llvm/lib/DebugInfo/PDB/PDBExtras.cpp
@@ -94,12 +94,11 @@ raw_ostream &llvm::pdb::operator<<(raw_ostream &OS, const PDB_DataKind &Data) {
 raw_ostream &llvm::pdb::operator<<(raw_ostream &OS,
                                    const codeview::RegisterId &Reg) {
   switch (Reg) {
-#define CV_REGISTER(name, val) case codeview::RegisterId::name: OS << #name; break;
+#define CV_REGISTER(name, val) case codeview::RegisterId::name: OS << #name; return OS;
 #include "llvm/DebugInfo/CodeView/CodeViewRegisters.def"
 #undef CV_REGISTER
-    default:
-      OS << static_cast<int>(Reg);
   }
+  OS << static_cast<int>(Reg);
   return OS;
 }
 
diff --git a/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.cpp b/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.cpp
index 6cbf2a1cb77..263b3fa3718 100644
--- a/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.cpp
+++ b/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.cpp
@@ -290,9 +290,8 @@ static std::string formatRegisterId(RegisterId Id) {
 #define CV_REGISTER(name, val) RETURN_CASE(RegisterId, name, #name)
 #include "llvm/DebugInfo/CodeView/CodeViewRegisters.def"
 #undef CV_REGISTER
-    default:
-      return formatUnknownEnum(Id);
   }
+  return formatUnknownEnum(Id);
 }
 
 static std::string formatRange(LocalVariableAddrRange Range) {