From e80c0bf6d7156e75342f44672bb27d88c254f3b7 Mon Sep 17 00:00:00 2001
From: Zachary Turner <zturner@google.com>
Date: Mon, 10 Jul 2017 17:01:28 +0000
Subject: [PATCH] Build fixes for pdb-diff test.

llvm-svn: 307556
---
 llvm/tools/llvm-pdbutil/Diff.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/llvm/tools/llvm-pdbutil/Diff.cpp b/llvm/tools/llvm-pdbutil/Diff.cpp
index 75e8f34bda06..98e0a8605213 100644
--- a/llvm/tools/llvm-pdbutil/Diff.cpp
+++ b/llvm/tools/llvm-pdbutil/Diff.cpp
@@ -101,8 +101,8 @@ struct BinaryPathProvider {
 
   SmallString<64> removeRoot(StringRef Path, bool IsRight) const {
     SmallString<64> Native(Path);
-    SmallString<64> Root =
-        IsRight ? opts::diff::RightRoot : opts::diff::LeftRoot;
+    auto &RootOpt = IsRight ? opts::diff::RightRoot : opts::diff::LeftRoot;
+    SmallString<64> Root(static_cast<std::string>(RootOpt));
     // pdb paths always use windows syntax, convert slashes to backslashes.
     sys::path::native(Root, sys::path::Style::windows);
     if (sys::path::has_stem(Root, sys::path::Style::windows))
@@ -449,7 +449,7 @@ diffOneModule(DiffPrinter &D,
 
   BinaryPathProvider PathProvider(28);
   auto Iter = llvm::find_if(
-      Other, [&Item, &PathProvider, ItemIsRight,
+      Other, [&PathProvider, ItemIsRight,
               L](const std::pair<uint32_t, DbiModuleDescriptor> &Other) {
         const auto *Left = L;
         const auto *Right = &Other;