From 428d92832c5d3427756046bb9d3786c51cb1bc6b Mon Sep 17 00:00:00 2001
From: Alex Lorenz <arphaman@gmail.com>
Date: Wed, 11 Sep 2019 21:00:13 +0000
Subject: [clang-scan-deps] cast Result to ErrorOr<unique_ptr<vfs::File>>
 explicitly to avoid s390x-linux buildbot failure

llvm-svn: 371664
---
 clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp')

diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp b/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp
index 12e8df6360c..7a3d189adac 100644
--- a/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp
+++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningFilesystem.cpp
@@ -203,7 +203,8 @@ createFile(const CachedFileSystemEntry *Entry,
   if (!Entry->getPPSkippedRangeMapping().empty() && PPSkipMappings)
     (*PPSkipMappings)[Result->getBufferPtr()] =
         &Entry->getPPSkippedRangeMapping();
-  return Result;
+  return llvm::ErrorOr<std::unique_ptr<llvm::vfs::File>>(
+      std::unique_ptr<llvm::vfs::File>(std::move(Result)));
 }
 
 } // end anonymous namespace
-- 
cgit v1.2.3