[llvm] r303391 - Fix some build errors and warnings.

[Zachary Turner via llvm-commits]

Author: zturner
Date: Thu May 18 18:12:42 2017
New Revision: 303391

URL: http://llvm.org/viewvc/llvm-project?rev=303391&view=rev
Log:
Fix some build errors and warnings.

Modified:
    llvm/trunk/lib/DebugInfo/CodeView/CVTypeVisitor.cpp
    llvm/trunk/tools/llvm-pdbdump/LLVMOutputStyle.cpp
    llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp

Modified: llvm/trunk/lib/DebugInfo/CodeView/CVTypeVisitor.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/DebugInfo/CodeView/CVTypeVisitor.cpp?rev=303391&r1=303390&r2=303391&view=diff
==============================================================================
--- llvm/trunk/lib/DebugInfo/CodeView/CVTypeVisitor.cpp (original)
+++ llvm/trunk/lib/DebugInfo/CodeView/CVTypeVisitor.cpp Thu May 18 18:12:42 2017
@@ -232,7 +232,7 @@ Error CVTypeVisitor::visitTypeStream(Typ
     CVType Type = Types.getType(*I);
     if (auto EC = visitTypeRecord(Type, *I))
       return EC;
-  } while (I = Types.getNext(*I));
+  } while ((I = Types.getNext(*I)));
   return Error::success();
 }
 

Modified: llvm/trunk/tools/llvm-pdbdump/LLVMOutputStyle.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/LLVMOutputStyle.cpp?rev=303391&r1=303390&r2=303391&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbdump/LLVMOutputStyle.cpp (original)
+++ llvm/trunk/tools/llvm-pdbdump/LLVMOutputStyle.cpp Thu May 18 18:12:42 2017
@@ -668,7 +668,7 @@ Error LLVMOutputStyle::dumpTpiStream(uin
     auto T = Types.getType(*I);
     if (auto EC = codeview::visitTypeRecord(T, *I, Pipeline))
       return EC;
-  } while (I = Types.getNext(*I));
+  } while ((I = Types.getNext(*I)));
 
   if (DumpTpiHash) {
     DictScope DD(P, "Hash");

Modified: llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp?rev=303391&r1=303390&r2=303391&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp (original)
+++ llvm/trunk/tools/llvm-pdbdump/llvm-pdbdump.cpp Thu May 18 18:12:42 2017
@@ -886,7 +886,7 @@ static void mergePdbs() {
         DestIpi.addTypeRecord(Data, None);
       });
 
-  SmallString<64> OutFile = opts::merge::PdbOutputFile;
+  SmallString<64> OutFile(opts::merge::PdbOutputFile);
   if (OutFile.empty()) {
     OutFile = opts::merge::InputFilenames[0];
     llvm::sys::path::replace_extension(OutFile, "merged.pdb");