[pdb] Fix some warnings that break -Werror builds.

llvm-svn: 277021

2 files changed, 3 insertions, 3 deletions

diff --git a/llvm/include/llvm/DebugInfo/Msf/StreamRef.h b/llvm/include/llvm/DebugInfo/Msf/StreamRef.h
index 87e53ce4fa4..ff280c03507 100644
--- a/llvm/include/llvm/DebugInfo/Msf/StreamRef.h
+++ b/llvm/include/llvm/DebugInfo/Msf/StreamRef.h
@@ -17,7 +17,7 @@ namespace llvm {
 namespace msf {
 template <class StreamType, class RefType> class StreamRefBase {
 public:
-  StreamRefBase() : Stream(nullptr), Length(0), ViewOffset(0) {}
+  StreamRefBase() : Stream(nullptr), ViewOffset(0), Length(0) {}
   StreamRefBase(const StreamType &Stream, uint32_t Offset, uint32_t Length)
       : Stream(&Stream), ViewOffset(Offset), Length(Length) {}
 
diff --git a/llvm/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp b/llvm/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp
index 6e1282263f6..b68f1dca091 100644
--- a/llvm/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp
+++ b/llvm/lib/DebugInfo/PDB/Raw/DbiStreamBuilder.cpp
@@ -198,9 +198,9 @@ Error DbiStreamBuilder::finalize() {
   DbiStreamHeader *H = Allocator.Allocate<DbiStreamHeader>();
 
   if (auto EC = generateModiSubstream())
-    return std::move(EC);
+    return EC;
   if (auto EC = generateFileInfoSubstream())
-    return std::move(EC);
+    return EC;
 
   H->VersionHeader = *VerHeader;
   H->VersionSignature = -1;