1 files changed, 4 insertions, 2 deletions
diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp
index 7a89723d85..e8d26e0d9e 100644
--- a/lib/IR/GCOV.cpp
+++ b/lib/IR/GCOV.cpp
@@ -514,8 +514,10 @@ FileInfo::openCoveragePath(StringRef CoveragePath) {
     return make_unique<raw_null_ostream>();
 
   std::string ErrorInfo;
-  auto OS = make_unique<raw_fd_ostream>(CoveragePath.str().c_str(), ErrorInfo,
-                                        sys::fs::F_Text);
+  // FIXME: When using MSVS, we end up having both std::make_unique and
+  // llvm::make_unique which conflict.  Explicitly use the llvm:: version.
+  auto OS = llvm::make_unique<raw_fd_ostream>(CoveragePath.str().c_str(),
+                                              ErrorInfo, sys::fs::F_Text);
   if (!ErrorInfo.empty()) {
     errs() << ErrorInfo << "\n";
     return make_unique<raw_null_ostream>();