Fix some build errors and warnings.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@303391 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/DebugInfo/CodeView/CVTypeVisitor.cpp b/lib/DebugInfo/CodeView/CVTypeVisitor.cpp
index b0f5378a2b73d67a96e1e9010770eff20dff8207..035b2c0a6afce82c6b81f84521d270362dcf7874 100644 (file)
--- a/lib/DebugInfo/CodeView/CVTypeVisitor.cpp
+++ b/lib/DebugInfo/CodeView/CVTypeVisitor.cpp
@@ -232,7 +232,7 @@ Error CVTypeVisitor::visitTypeStream(TypeCollection &Types) {
     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();
 }
 

diff --git a/tools/llvm-pdbdump/LLVMOutputStyle.cpp b/tools/llvm-pdbdump/LLVMOutputStyle.cpp
index 4b94f8b700687028ba6f333c7d6a6ec33a00cb8c..f75a2411ac2327638883a2e624be8eb8f8238d03 100644 (file)
--- a/tools/llvm-pdbdump/LLVMOutputStyle.cpp
+++ b/tools/llvm-pdbdump/LLVMOutputStyle.cpp
@@ -668,7 +668,7 @@ Error LLVMOutputStyle::dumpTpiStream(uint32_t StreamIdx) {
     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");

diff --git a/tools/llvm-pdbdump/llvm-pdbdump.cpp b/tools/llvm-pdbdump/llvm-pdbdump.cpp
index d9004f78a0eb70ab9badeeafa96078a24330b6dc..1767c3cfda8512fbb5519262d02618167dd2969e 100644 (file)
--- a/tools/llvm-pdbdump/llvm-pdbdump.cpp
+++ b/tools/llvm-pdbdump/llvm-pdbdump.cpp
@@ -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");