Fix some more warnings.

llvm-svn: 305499

4 files changed, 19 insertions, 28 deletions

diff --git a/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.cpp b/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.cpp
index 013f89b..8b36de0 100644
--- a/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.cpp
+++ b/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.cpp
@@ -172,18 +172,16 @@ static std::string formatThunkOrdinal(ThunkOrdinal Ordinal) {
     RETURN_CASE(ThunkOrdinal, UnknownLoad, "unknown load");
     RETURN_CASE(ThunkOrdinal, TrampIncremental, "tramp incremental");
     RETURN_CASE(ThunkOrdinal, BranchIsland, "branch island");
-  default:
-    return formatUnknownEnum(Ordinal);
   }
+  return formatUnknownEnum(Ordinal);
 }
 
 static std::string formatTrampolineType(TrampolineType Tramp) {
   switch (Tramp) {
     RETURN_CASE(TrampolineType, TrampIncremental, "tramp incremental");
     RETURN_CASE(TrampolineType, BranchIsland, "branch island");
-  default:
-    return formatUnknownEnum(Tramp);
   }
+  return formatUnknownEnum(Tramp);
 }
 
 static std::string formatSourceLanguage(SourceLanguage Lang) {
@@ -196,6 +194,7 @@ static std::string formatSourceLanguage(SourceLanguage Lang) {
     RETURN_CASE(SourceLanguage, Basic, "basic");
     RETURN_CASE(SourceLanguage, Cobol, "cobol");
     RETURN_CASE(SourceLanguage, Link, "link");
+    RETURN_CASE(SourceLanguage, VB, "vb");
     RETURN_CASE(SourceLanguage, Cvtres, "cvtres");
     RETURN_CASE(SourceLanguage, Cvtpgd, "cvtpgd");
     RETURN_CASE(SourceLanguage, CSharp, "c#");
@@ -204,9 +203,8 @@ static std::string formatSourceLanguage(SourceLanguage Lang) {
     RETURN_CASE(SourceLanguage, JScript, "javascript");
     RETURN_CASE(SourceLanguage, MSIL, "msil");
     RETURN_CASE(SourceLanguage, HLSL, "hlsl");
-  default:
-    return formatUnknownEnum(Lang);
   }
+  return formatUnknownEnum(Lang);
 }
 
 static std::string formatMachineType(CPUType Cpu) {
@@ -270,9 +268,8 @@ static std::string formatMachineType(CPUType Cpu) {
     RETURN_CASE(CPUType, Thumb, "thumb");
     RETURN_CASE(CPUType, ARMNT, "arm nt");
     RETURN_CASE(CPUType, D3D11_Shader, "d3d11 shader");
-  default:
-    return formatUnknownEnum(Cpu);
   }
+  return formatUnknownEnum(Cpu);
 }
 
 static std::string formatCookieKind(FrameCookieKind Kind) {
@@ -281,9 +278,8 @@ static std::string formatCookieKind(FrameCookieKind Kind) {
     RETURN_CASE(FrameCookieKind, XorStackPointer, "xor stack ptr");
     RETURN_CASE(FrameCookieKind, XorFramePointer, "xor frame ptr");
     RETURN_CASE(FrameCookieKind, XorR13, "xor rot13");
-  default:
-    return formatUnknownEnum(Kind);
   }
+  return formatUnknownEnum(Kind);
 }
 
 static std::string formatRegisterId(RegisterId Id) {
diff --git a/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.h b/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.h
index 319e4c2..451f2da 100644
--- a/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.h
+++ b/llvm/tools/llvm-pdbutil/MinimalSymbolDumper.h
@@ -24,10 +24,10 @@ class MinimalSymbolDumper : public codeview::SymbolVisitorCallbacks {
 public:
   MinimalSymbolDumper(LinePrinter &P, bool RecordBytes,
                       codeview::LazyRandomTypeCollection &Types)
-      : P(P), RecordBytes(RecordBytes), Types(Types) {}
+      : P(P), Types(Types) {}
 
-  virtual Error visitSymbolBegin(codeview::CVSymbol &Record);
-  virtual Error visitSymbolEnd(codeview::CVSymbol &Record);
+  Error visitSymbolBegin(codeview::CVSymbol &Record) override;
+  Error visitSymbolEnd(codeview::CVSymbol &Record) override;
 
 #define SYMBOL_RECORD(EnumName, EnumVal, Name)                                 \
   virtual Error visitKnownRecord(codeview::CVSymbol &CVR,                      \
@@ -39,7 +39,6 @@ private:
   std::string typeIndex(codeview::TypeIndex TI) const;
 
   LinePrinter &P;
-  bool RecordBytes = false;
   codeview::LazyRandomTypeCollection &Types;
 };
 } // namespace pdb
diff --git a/llvm/tools/llvm-pdbutil/MinimalTypeDumper.cpp b/llvm/tools/llvm-pdbutil/MinimalTypeDumper.cpp
index 185dd40..98813e0 100644
--- a/llvm/tools/llvm-pdbutil/MinimalTypeDumper.cpp
+++ b/llvm/tools/llvm-pdbutil/MinimalTypeDumper.cpp
@@ -103,15 +103,15 @@ static std::string formatCallingConvention(CallingConvention Convention) {
     RETURN_CASE(CallingConvention, NearFast, "fastcall");
     RETURN_CASE(CallingConvention, NearPascal, "pascal");
     RETURN_CASE(CallingConvention, NearStdCall, "stdcall");
+    RETURN_CASE(CallingConvention, NearSysCall, "near syscall");
     RETURN_CASE(CallingConvention, NearVector, "vectorcall");
     RETURN_CASE(CallingConvention, PpcCall, "ppccall");
+    RETURN_CASE(CallingConvention, SHCall, "shcall");
     RETURN_CASE(CallingConvention, SH5Call, "sh5call");
     RETURN_CASE(CallingConvention, ThisCall, "thiscall");
     RETURN_CASE(CallingConvention, TriCall, "tricall");
-  default:
-    return formatUnknownEnum(Convention);
   }
-  return "";
+  return formatUnknownEnum(Convention);
 }
 
 static std::string formatPointerMode(PointerMode Mode) {
@@ -121,19 +121,18 @@ static std::string formatPointerMode(PointerMode Mode) {
     RETURN_CASE(PointerMode, PointerToDataMember, "data member pointer");
     RETURN_CASE(PointerMode, PointerToMemberFunction, "member fn pointer");
     RETURN_CASE(PointerMode, RValueReference, "rvalue ref");
-  default:
-    return formatUnknownEnum(Mode);
   }
+  return formatUnknownEnum(Mode);
 }
 
 static std::string memberAccess(MemberAccess Access) {
   switch (Access) {
+    RETURN_CASE(MemberAccess, None, "");
     RETURN_CASE(MemberAccess, Private, "private");
     RETURN_CASE(MemberAccess, Protected, "protected");
     RETURN_CASE(MemberAccess, Public, "public");
-  default:
-    return formatUnknownEnum(Access);
   }
+  return formatUnknownEnum(Access);
 }
 
 static std::string methodKind(MethodKind Kind) {
@@ -145,9 +144,8 @@ static std::string methodKind(MethodKind Kind) {
     RETURN_CASE(MethodKind, IntroducingVirtual, "intro virtual");
     RETURN_CASE(MethodKind, PureVirtual, "pure virtual");
     RETURN_CASE(MethodKind, PureIntroducingVirtual, "pure intro virtual");
-  default:
-    return formatUnknownEnum(Kind);
   }
+  return formatUnknownEnum(Kind);
 }
 
 static std::string pointerKind(PointerKind Kind) {
@@ -165,9 +163,8 @@ static std::string pointerKind(PointerKind Kind) {
     RETURN_CASE(PointerKind, Near32, "ptr32");
     RETURN_CASE(PointerKind, Far32, "far ptr32");
     RETURN_CASE(PointerKind, Near64, "ptr64");
-  default:
-    return formatUnknownEnum(Kind);
   }
+  return formatUnknownEnum(Kind);
 }
 
 static std::string memberAttributes(const MemberAttributes &Attrs) {
diff --git a/llvm/tools/llvm-pdbutil/RawOutputStyle.cpp b/llvm/tools/llvm-pdbutil/RawOutputStyle.cpp
index aba34c1..8afd727 100644
--- a/llvm/tools/llvm-pdbutil/RawOutputStyle.cpp
+++ b/llvm/tools/llvm-pdbutil/RawOutputStyle.cpp
@@ -608,7 +608,7 @@ Error RawOutputStyle::dumpSectionContribs() {
 
   class Visitor : public ISectionContribVisitor {
   public:
-    Visitor(LinePrinter &P, DbiStream &DS) : P(P), DS(DS) {}
+    Visitor(LinePrinter &P) : P(P) {}
     void visit(const SectionContrib &SC) override {
       P.formatLine(
           "SC  | mod = {2}, {0}, size = {1}, data crc = {3}, reloc crc = {4}",
@@ -631,10 +631,9 @@ Error RawOutputStyle::dumpSectionContribs() {
 
   private:
     LinePrinter &P;
-    DbiStream &DS;
   };
 
-  Visitor V(P, Dbi);
+  Visitor V(P);
   Dbi.visitSectionContributions(V);
   return Error::success();
 }